72471 Commits

Author SHA1 Message Date
Andrew Nicols
ead8b28f92 MDL-49144 blocks: Sanitise alt and title for block controls 2015-03-02 12:09:45 +00:00
Andrew Nicols
8721ed57a4 MDL-49144 blocks: Add behat test to ensury sanity of block title 2015-03-02 12:09:45 +00:00
Dan Poltawski
a8c56d1c26 Merge branch 'MDL-47911-master' of git://github.com/damyon/moodle 2015-03-02 11:06:18 +00:00
Ankit Agarwal
07323f50ff MDL-38466 filters: Redos protection and unit tests 2015-03-02 11:28:52 +01:00
Zachary Durber
a5b8265fc3 MDL-38466 filters: ReDoS protection for text to URL conversion. 2015-03-02 11:28:51 +01:00
Dan Poltawski
add310ab44 Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle 2015-03-02 09:33:40 +00:00
Brian Barnes
35fe9b8aa4 MDL-48060 messaging: Removed table from contact list 2015-03-02 09:04:04 +13:00
Mary Evans
b3f82770f8 MDL-49214 theme_bootstrapbase: OL list numbers cut off in Clean theme 2015-03-01 19:22:44 +00:00
Jean-Michel Vedrine
70206b2f72 MDL-48912 mod_lesson: Deprecate essayemailmessage string 2015-02-27 21:15:28 +01:00
Jean-Michel Vedrine
cb69eb8a00 MDL-48912 mod_lesson: Essay page title disclosed to student 2015-02-27 21:15:27 +01:00
Tony Butler
d312bb70b4 MDL-49328 mod_choice: Include 'showpreview' field in module backup 2015-02-27 09:46:57 +00:00
Eric Merrill
4ea7da7828 MDL-47911 gradebook: Improve the performance of set_usedinaggregation
This function is called many many times during grade calculation, so it
should be as efficient as possible.
2015-02-27 09:46:34 +08:00
Andrew Davis
3efd707d63 MDL-48975 core_registration: altered registration strings 2015-02-26 19:38:30 +01:00
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Jean-Michel Vedrine
a1acc00177 MDL-48962 mod-lesson: maxtime should use a duration form element 2015-02-26 10:28:42 +01:00
Dan Marsden
5e437bc0c0 MDL-49303 mod_scorm: Initialise student preferences on re-entry. 2015-02-26 20:36:48 +13:00
John Okely
e562a244b6 MDL-35995 mod_glossary: Allow rating of unapproved glossary items 2015-02-26 11:01:57 +08:00
Simey Lameze
ead4d41e39 MDL-49246 gradebook: add capability checks on key manager pages. 2015-02-26 10:23:50 +08:00
Tim Hunt
b3d388c234 MDL-49284 formslib: fix strict validation of HTML. 2015-02-25 17:39:36 +00:00
Stephen Bourget
60742fdad1 MDL-34006 Lesson: Behat tests 2015-02-25 10:22:59 -05:00
Stephen Bourget
6695d5947f MDL-34006 Lesson: Resume lesson loads wrong page. 2015-02-25 10:22:41 -05:00
Dan Poltawski
dba564c7db weekly release 2.9dev 2015-02-25 14:57:28 +00:00
Dan Poltawski
ecd9c732de NOBUG: Fixed file access permissions 2015-02-25 14:57:28 +00:00
Mitsuhiro Yoshida
6396b58e15 MDL-49259 lib: Fix for unzipped Japanese filename character corruption 2015-02-25 23:29:02 +09:00
Simey Lameze
2ec274f5ff MDL-48142 core_badge: final polishing on badge award event 2015-02-25 14:25:33 +00:00
Martin Mastny
7e7c15fbd1 MDL-49237 theme_base: made block calendar captions smaller in base theme 2015-02-25 15:29:39 +08:00
Martin Mastny
d70503a913 MDL-49237 theme_bootstrapbase: calendar block captions made smaller 2015-02-25 15:29:29 +08:00
Andrew Nicols
3d9c8578f7 MDL-48108 message: Use sql_concat instead of sql_concat_join 2015-02-25 14:35:17 +08:00
Andrew Nicols
cf2927ba4d Merge branch 'MDL-49046-master-fix1' of http://github.com/damyon/moodle 2015-02-25 11:58:55 +08:00
Andrew Nicols
46d508cdce Merge branch 'MDL-46238_master-fix' of git://github.com/dmonllao/moodle 2015-02-25 11:35:42 +08:00
Damyon Wiese
c95442b2ca MDL-49046 output: Make moodle_url->set_slashargument more robust
It was throwing debugging when used on the install page (before config is generated).
2015-02-25 11:28:24 +08:00
David Monllao
52a5d7a225 MDL-46238 course: Add newcourse param to enrol user filter 2015-02-25 11:26:18 +08:00
David Monllao
b1a1840905 MDL-46238 course: Replaces a tab for whitespaces 2015-02-25 10:11:47 +08:00
David Monllao
d84a9a322e Merge branch 'MDL-46238' of git://github.com/shashirepo/moodle 2015-02-25 09:52:30 +08:00
Andrew Nicols
db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
2015-02-25 09:20:26 +08:00
Andrew Nicols
1725c553ac MDL-49008 lang: Revert unnecessary rename warning
This was failing unit tests because it does not check for the presence of
the source directory first. If there is no source directory, it cannot be
moved.
2015-02-25 08:54:45 +08:00
Eric Merrill
774c00c740 MDL-47000 session: Update memcached version referecnes to 2.2.0 2015-02-24 15:18:15 -05:00
Eric Merrill
2909c04408 MDL-49285 quiz: Include lib.php for phpunit test 2015-02-24 14:53:46 -05:00
Eric Merrill
1245bfd5f0 MDL-49160 quiz: Make sure to not select an outcome grade item
When we are computing completion, make sure we select only the true
grade_item, not outcome grade items.
2015-02-24 14:40:36 -05:00
Dan Poltawski
86e5b0a707 Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle 2015-02-24 16:54:58 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Tony Butler
f1399fb8e7 MDL-49220 mod_choice: Add behat scenario to test choice preview option 2015-02-24 16:25:18 +00:00
Dan Poltawski
94e4ca4cca Merge branch 'MDL-46665' of https://github.com/rlorenzo/moodle 2015-02-24 11:51:44 +00:00
Dan Poltawski
6750b66c39 Merge branch 'MDL-48142-master' of git://github.com/lameze/moodle 2015-02-24 11:21:50 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Dan Poltawski
6856894efe Merge branch 'wip_MDL-49184_m29_choice' of https://github.com/skodak/moodle 2015-02-24 10:43:15 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Andrew Nicols
17dd7e7ccd Merge branch 'MDL-48730-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-02-24 18:12:32 +08:00
Andrew Nicols
b6daeec8bd Merge branch 'm29_MDL-48519' of https://github.com/totara/moodle 2015-02-24 17:51:22 +08:00