68418 Commits

Author SHA1 Message Date
Adrian Greeve
4b8f05adc6 MDL-45421 report_eventlist: Changed sorting of event name column to sort by event name.
It was sorting by the full event path previous to this.
2014-05-07 12:30:36 +08:00
Dan Poltawski
fa00be94b1 Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle 2014-05-07 12:05:17 +08:00
Dan Poltawski
4d693c3839 Merge branch 'wip-MDL-45429-master' of git://github.com/marinaglancy/moodle 2014-05-07 11:50:09 +08:00
Eric Merrill
391101008a MDL-45439 reports Don't send contextlevel to legacy logging.
It doesn't support the column.
2014-05-07 11:10:19 +08:00
Jetha Chan
c9b94fb0d4 MDL-45387 core_form: erroneous escaping on reference list
Fixed erroneous escaping in JS.
2014-05-07 10:52:51 +08:00
Helen Foster
f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Sam Hemelryk
cfd97e02f7 MDL-45231 theme_clean: navbar is absolute when running behat in IE 2014-05-07 09:42:07 +12:00
Mark Nielsen
4bcde92185 MDL-44630: Fix CC backup of quizzes
The common cartridge backup was skipping
quizzes because the <questions> element
is no longer in the Moodle backup file.
Instead, now reading from the list of
<question_instances> list.
2014-05-06 14:00:13 -07:00
Eloy Lafuente (stronk7)
f8fa440649 on-demand release 2.7rc1+ 2014-05-06 15:57:48 +02:00
Marina Glancy
88c0e2f374 MDL-45357 events: unittest correction, event description change 2014-05-06 17:13:37 +08:00
Jetha Chan
cecd602d8b MDL-45290 rubrics: overflow, delete button alignment
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
2014-05-06 16:47:20 +08:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Andrew Nicols
4d87e5c109 MDL-45357 events: Normalise event description names 2014-05-06 16:44:04 +08:00
Andrew Nicols
f32629c7ea MDL-45357 events: Improve clarity of allow role change descriptions 2014-05-06 16:43:56 +08:00
Mark Nelson
196d227f21 MDL-45357 events: removed unnecessary verb from description 2014-05-06 16:43:29 +08:00
Andrew Nicols
eb497e26fb MDL-45338 editor_atto: Correct gesturemoveend listening
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
2014-05-06 16:10:31 +08:00
Marina Glancy
447d55d55a MDL-45429 block_glossary_random: check capability before suggesting to edit 2014-05-06 16:06:29 +08:00
James Pratt
96a0b9aaaa MDL-45373 quiz response analysis : count all tries at question
don't filter repeated tries.
2014-05-06 12:26:02 +07:00
Marina Glancy
e7efd59b51 Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle 2014-05-06 12:19:58 +08:00
Damyon Wiese
e4f1dd46b0 MDL-45412 Cache: Mongo DB string change (older is less than) 2014-05-06 12:03:44 +08:00
Damyon Wiese
7c6f2e29ae MDL-45412 Cache: Look for the newer classname first (mongo store) 2014-05-06 12:03:27 +08:00
Damyon Wiese
87f7ae9c46 Merge branch '45412-27' of git://github.com/samhemelryk/moodle 2014-05-06 12:03:19 +08:00
Dan Poltawski
02c482704b Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
2014-05-06 11:48:38 +08:00
Dan Poltawski
73c2ae4bff Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-05-06 11:34:17 +08:00
Marina Glancy
c3625f5ba3 MDL-45414 wiki: fix broken image 2014-05-06 11:34:01 +08:00
Dan Poltawski
63469ab11d Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle 2014-05-06 11:27:41 +08:00
Damyon Wiese
f35bfa2cff Merge branch 'MDL-45290-master-fix' of http://github.com/jethac/moodle 2014-05-06 11:23:39 +08:00
Dan Poltawski
4644e7d067 Merge branch 'MDL-45376-master' of https://github.com/sammarshallou/moodle 2014-05-06 11:16:32 +08:00
Jetha Chan
fe778267f2 MDL-45290 rubric: IE8 and minor fixes, RTL
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
2014-05-06 10:44:59 +08:00
Dan Poltawski
5bf52355ea Merge branch 'MDL-30106' of git://github.com/jleyva/moodle 2014-05-06 10:25:48 +08:00
Dan Poltawski
ba60c47265 Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle 2014-05-06 10:18:44 +08:00
Sam Hemelryk
6deb0813d0 MDL-45412 cachestore_mongodb: added notification of old Mongo version use 2014-05-06 09:30:27 +12:00
Sam Hemelryk
4907a8ed70 MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class 2014-05-06 09:29:45 +12:00
Juan Leyva
fb8840d291 MDL-30106 forum: get_posts WS fixes in data generator and def. values 2014-05-05 11:56:43 +02:00
Juan Leyva
4ed1546154 MDL-30106 forum: Bump version number (upgrading service and installing new ws) 2014-05-05 11:56:43 +02:00
Juan Leyva
e2ede4262f MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts 2014-05-05 11:55:43 +02:00
Frederic Massart
664c851755 MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true 2014-05-05 17:47:54 +08:00
Frederic Massart
e76ae8077a MDL-45253 editor_atto: Async the highlighting of buttons 2014-05-05 17:46:13 +08:00
Frederic Massart
fafeb5a293 MDL-45253 editor_atto: Check for button highlights on change event
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
2014-05-05 17:46:13 +08:00
Frederic Massart
e988383645 MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty 2014-05-05 17:46:13 +08:00
Frederic Massart
d78920bdba MDL-45253 editor_atto: selectionFilterMatches includes parents 2014-05-05 17:46:13 +08:00
Marina Glancy
6df154bd20 Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:41:01 +08:00
Damyon Wiese
6d8617bed9 Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-05-05 17:24:08 +08:00
Marina Glancy
a7c1a5bcb5 Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle 2014-05-05 17:18:04 +08:00
Marina Glancy
4cbe8be96d Merge branch 'MDL-45342-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:17:45 +08:00
Marina Glancy
cbc394fabf Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle 2014-05-05 17:17:30 +08:00
Marina Glancy
d0144cd38e Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle 2014-05-05 17:17:11 +08:00
Marina Glancy
b9c5bae5b1 Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle 2014-05-05 17:16:52 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector"
And some minor cleanups.
2014-05-05 16:27:36 +08:00
Ankit Agarwal
5793538a59 MDL-45409 conditional_activity: Do not iterate over deprecated properties 2014-05-05 16:26:35 +08:00