Commit Graph

70430 Commits

Author SHA1 Message Date
Juan Leyva b0abcbda17 MDL-48691 webservices: Check if the user must be changing password 2015-03-02 14:40:05 +00:00
Simey Lameze 1a344ea46f MDL-49084 core_tag: add capability check to flag as inappropriate action 2015-03-02 12:52:16 +00:00
Andrew Nicols 3a89cea7f7 MDL-49144 blocks: Sanitise alt and title for block controls 2015-03-02 12:09:58 +00:00
Andrew Nicols 3657649aaa MDL-49144 blocks: Add behat test to ensury sanity of block title 2015-03-02 12:09:57 +00:00
Ankit Agarwal 12ba38e725 MDL-38466 filters: Redos protection and unit tests 2015-03-02 11:31:04 +01:00
Zachary Durber fdab8c0a51 MDL-38466 filters: ReDoS protection for text to URL conversion. 2015-03-02 11:31:04 +01:00
Dan Poltawski 1bf41ebcd8 Merge branch 'MDL-23273-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE 2015-03-02 09:33:59 +00:00
Dan Poltawski deea56cf6f weekly release 2.7.5+ 2015-02-25 14:57:34 +00:00
Dan Poltawski ff6092696c Merge branch 'install_27_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_27_STABLE 2015-02-25 14:57:32 +00:00
Dan Poltawski a9558a0559 Merge branch 'MDL-49241-27-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE 2015-02-24 16:53:56 +00:00
Dan Poltawski e2abf6048c Merge branch 'wip_MDL-49184_m27_choice' of https://github.com/skodak/moodle into MOODLE_27_STABLE 2015-02-24 10:43:36 +00:00
Brian Barnes 8527a343e1 MDL-48519 accessibility: improved accessibility of user filters 2015-02-24 17:53:36 +08:00
Andrew Nicols 4b4466e559 Merge branch 'MDL-49078_m27' of git://github.com/shashirepo/moodle into MOODLE_27_STABLE 2015-02-24 17:08:52 +08:00
Andrew Nicols b70c6fcf87 Merge branch 'MDL-49008_lang_vanish_27' of https://github.com/andyjdavis/moodle into MOODLE_27_STABLE 2015-02-24 16:55:08 +08:00
Shashikant Vaishnav 98b1c93d11 MDL-49078 theme_bootstrapbase: 'Create new course' text too high
Thanks to  Gareth J Barnard  for the code suggestion
2015-02-24 14:22:27 +05:30
Dan Poltawski 0aadd59a87 Merge branch 'MDL-49216-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE 2015-02-24 08:31:57 +00:00
Andrew Davis e742ba8b7e MDL-49008 lang: dont preemptively delete lang packs when updating 2015-02-24 09:18:06 +01:00
David Monllao 938d6e9def Merge branch 'MDL-48899-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE 2015-02-24 16:17:37 +08:00
Zachary Durber 0396e811bb MDL-23273 mod_choice: error continue button redirects back to choice
Locks only occur when a choice is using limits.
2015-02-24 12:58:04 +08:00
Andrew Nicols 0eaac55d01 Merge branch 'mdl27_MDL-46408' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE 2015-02-24 11:36:49 +08:00
Andrew Nicols 933fa26e63 MDL-49216 mod_forum: Move subquery to outer component
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
2015-02-24 08:31:43 +08:00
Andrew Nicols d0284fe719 MDL-49216 mod_forum: Add tests for discussion reply count 2015-02-24 08:31:36 +08:00
Helen Foster 2017880f90 MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-23 21:17:31 +01:00
Dan Poltawski 8bcfbda511 Merge branch 'MDL-49198_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE 2015-02-23 16:29:27 +00:00
Dan Poltawski a06527d280 Merge branch 'MDL-49200_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE 2015-02-23 16:20:06 +00:00
Dan Poltawski d830e39f28 Merge branch 'MOODLE_27_STABLE' of https://github.com/eberhardt/moodle into MOODLE_27_STABLE 2015-02-23 15:55:39 +00:00
Andrew Nicols bb323b1876 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:03:23 +08:00
Andrew Nicols 6253df7309 Merge branch 'MDL-48807-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE 2015-02-23 15:09:49 +08:00
Simey Lameze 817837bdd1 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:44:04 +08:00
Simey Lameze 1cf194adaa MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:41:05 +08:00
Zachary Durber 93f6e83dce MDL-23273 mod_choice: Using locks to ensure choice limits 2015-02-23 10:48:51 +08:00
David Monllao 4bc553ab04 MDL-49145 report_log: Moving conditions
Now get_url() does not need to be resolved when
we are downloading.
2015-02-23 10:39:09 +08:00
Andrew Nicols 1092970fda Merge branch 'MDL-49174-27' of git://github.com/jleyva/moodle into MOODLE_27_STABLE 2015-02-23 09:37:01 +08:00
Andrew Nicols 12e121ed33 Merge branch 'MDL-35392-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE 2015-02-23 09:22:26 +08:00
Zachary Durber 6e040c0593 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
2015-02-23 09:17:17 +08:00
Andrew Nicols 0488bd92cd Merge branch 'MDL-49145_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE 2015-02-23 09:06:26 +08:00
David Monllao 036bf6ec37 MDL-49145 report_log: Fixing condition
Credit and thanks to Tyler Bannister and Renaat Debleu.
2015-02-23 08:47:08 +08:00
Dan Marsden 772ec0a6e3 MDL-46408 mod_scorm: check param is set before using.
The default org is only set if it exists in the imsmanifest.xml
2015-02-20 13:42:57 +13:00
AMOS bot 89b06d239f Automatically generated installer lang files 2015-02-20 00:04:19 +08:00
Jan Eberhardt fcf8a305ea MDL-31578 auth_shibboleth: Custom fields added to shibboleth settings
Since LDAP is able to sync custom user profile fields, this feature was
requested for Shibboleth.
2015-02-19 13:56:26 +00:00
Eloy Lafuente (stronk7) 327272881a weekly release 2.7.5+ 2015-02-19 10:44:36 +01:00
Andrew Nicols 86d20a95c8 Revert "Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE"
This reverts commit e0312ddb49, reversing
changes made to 636eb3726c.
2015-02-19 09:18:40 +08:00
Rajesh Taneja fd77d51e5d MDL-48841 admin: Fixed changed string 2015-02-18 16:33:38 +08:00
Rajesh Taneja 992a8a42d5 MDL-48841 admin: Behat table row should start with first row 2015-02-18 15:47:46 +08:00
Botond Hegedus bd3332ff6e MDL-49198 core_webservice: Fix error when using existing service name 2015-02-17 23:14:29 -08:00
David Monllao 94c912d7c4 Merge branch 'MDL-49034_m27' of git://github.com/mattporritt/moodle into MOODLE_27_STABLE 2015-02-18 09:36:49 +08:00
Eloy Lafuente (stronk7) 3692b5dd8b Merge branch 'MDL-49211_M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE 2015-02-18 00:04:08 +01:00
Eloy Lafuente (stronk7) f423902be7 Merge branch 'MDL-48973_27' of https://github.com/pauln/moodle into MOODLE_27_STABLE 2015-02-17 23:53:00 +01:00
Eloy Lafuente (stronk7) e0312ddb49 Merge branch 'MDL-49154_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE 2015-02-17 23:47:13 +01:00
Eloy Lafuente (stronk7) 636eb3726c Merge branch 'MDL-49170_27' of https://github.com/totara/openbadges into MOODLE_27_STABLE 2015-02-17 23:43:44 +01:00