72465 Commits

Author SHA1 Message Date
David Monllao
fdc30bd7c5 Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle 2015-02-24 16:07:18 +08:00
Andrew Davis
21b859e935 MDL-29008 lang: reintroduced error silencing to prevent unit test failures 2015-02-24 09:00:25 +01:00
Damyon Wiese
bef63c520c MDL-49240 webservices: core_get_string and friends bad lang handling
The core_get_string webservice and friends have never passed lang values
properly, (so never worked) and when I fixed that I found they were passing
lang parameter into the lazyload parameter.
2015-02-24 15:32:17 +08:00
Zachary Durber
5b83949ad1 MDL-23273 mod_choice: error continue button redirects back to choice
Locks only occur when a choice is using limits.
2015-02-24 12:14:15 +08:00
Andrew Nicols
78f26c076c Merge branch 'MDL-34375_m29v2' of https://github.com/sbourget/moodle 2015-02-24 11:40:27 +08:00
Andrew Nicols
ad80b121ad Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle 2015-02-24 11:34:27 +08:00
Andrew Nicols
2eaf309d16 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 11:07:05 +08:00
Andrew Nicols
8b52863f0a MDL-48108 core: Add new indexes to message tables 2015-02-24 09:39:05 +08:00
Andrew Nicols
b5e9faa67e MDL-48108 message: Rewrite recent conversations 2015-02-24 09:38:50 +08:00
Andrew Nicols
6c10b1cc88 MDL-48108 message: Add additional testing for recent conversations 2015-02-24 09:38:49 +08:00
Andrew Nicols
38ec3fb080 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:29:43 +08:00
Andrew Nicols
94802d3518 MDL-49216 mod_forum: Add tests for discussion reply count 2015-02-24 08:29:43 +08:00
Dan Poltawski
4b525e7508 Merge branch 'MDL-49198_master' of https://github.com/markn86/moodle 2015-02-23 16:29:24 +00:00
Dan Poltawski
8d952359d2 Merge branch 'MDL-49200_master' of https://github.com/markn86/moodle 2015-02-23 16:25:25 +00:00
Dan Poltawski
d75bc7ea13 Merge branch 'master' of https://github.com/eberhardt/moodle 2015-02-23 15:55:36 +00:00
Dan Poltawski
c40678fb44 Merge branch 'MDL-49046-master' of git://github.com/damyon/moodle 2015-02-23 13:33:40 +00:00
Damyon Wiese
adeb96d28f MDL-49046 javascript: Add support for AMD modules and jquery.
Grunt is the build tool.
2015-02-23 16:23:10 +08:00
Andrew Nicols
558354df81 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:01:58 +08:00
Andrew Nicols
49e6309f08 Merge branch 'MDL-48807-master' of git://github.com/lameze/moodle 2015-02-23 14:46:59 +08:00
Simey Lameze
77df1778f2 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:33:39 +08:00
Simey Lameze
5a39b24b9a MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:25:21 +08:00
Zachary Durber
e776b415f4 MDL-23273 mod_choice: Using locks to ensure choice limits 2015-02-23 10:47:46 +08:00
David Monllao
40b10c304a MDL-49145 report_log: Moving conditions
Now get_url() does not need to be resolved when
we are downloading.
2015-02-23 10:30:47 +08:00
Andrew Nicols
27fdee391c Merge branch 'MDL-49174-master' of git://github.com/jleyva/moodle 2015-02-23 09:35:45 +08:00
Andrew Nicols
07754b4c67 Merge branch 'MDL-35392-master' of git://github.com/zbdd/moodle 2015-02-23 09:20:25 +08:00
Zachary Durber
3547f186a8 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:14:05 +08:00
Andrew Nicols
f393b0592e Merge branch 'MDL-49145_master' of git://github.com/dmonllao/moodle 2015-02-23 09:05:34 +08:00
David Monllao
fada0d44cc MDL-49145 report_log: Fixing condition
Credit and thanks to Tyler Bannister and Renaat Debleu.
2015-02-23 08:45:25 +08:00
Andrew Davis
4a85b4c0d0 MDL-49008 lang: removed preemptive deleting of old language files 2015-02-22 19:58:57 +01:00
Andrew Davis
323f95b222 MDL-49008 lang: made lang update error reporting work 2015-02-22 19:58:57 +01:00
Rex Lorenzo
c85140350b MDL-46665 core_user: Add 'idnumber' field to user filter 2015-02-20 10:34:08 -08:00
Tony Butler
c30dbd69e7 MDL-49220 mod_choice: Add option to allow students to preview choices 2015-02-20 14:27:55 +00:00
Stephen Bourget
1cf8ca343f MDL-49183 Lesson: Add additional events 2015-02-19 21:16:26 -05:00
Dan Marsden
a544661398 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 14:41:07 +13:00
Tim Price
91d10e7686 MDL-18177 backup: fixing PHPdocs errors 2015-02-20 11:45:23 +11:00
Tim Price
e1de40f7f7 MDL-18177 backup: adding PHPdocs blocks 2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd MDL-18177 backup: addressing coding standards 2015-02-20 11:45:23 +11:00
Matt Sammarco
5ef6f97f47 MDL-18177 availability: Excluding group members availability info
If setting was not enabled when backing up, exclude the availability
information of group members.
2015-02-20 11:45:22 +11:00
Matt Sammarco
868b086c4a MDL-18177 backup: Add backup option to include groups and groupings 2015-02-20 11:45:22 +11:00
Tim Hunt
8def548b8d MDL-49247 question restore: avoid unique key errors from old bad data
Several tables have had unique keys added to enforce a constraint that
should always have been there. It is possible for old sites to have
data that violate the constraints, and sometimes people want to backup
data from those old sites, and restore them into a new Moodle.
Therefore, we need to guard agains the unique key violation errors.
2015-02-19 21:46:56 +00:00
Juan Leyva
f494a81167 MDL-48716 webservices: core_user_remove_user_device unit tests 2015-02-19 15:15:18 +01:00
Juan Leyva
3221718eda MDL-48716 webservices: New ws core_user_remove_user_device 2015-02-19 15:15:18 +01:00
Juan Leyva
12da294e3e MDL-49174 webservices: Return front page contents in get_contents ws 2015-02-19 15:08:02 +01:00
Jan Eberhardt
5921f6974d 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:10 +00:00
shashi
bbc3b07965 MDL-46238 enrol:add a simple way to go back to course page 2015-02-19 16:56:53 +05:30
Eloy Lafuente (stronk7)
95751e81ac weekly release 2.9dev 2015-02-19 10:44:24 +01:00
Eloy Lafuente (stronk7)
5eb6047eae NOBUG: Fixed file access permissions 2015-02-19 10:44:24 +01:00
Ankit Agarwal
575e27f31e MDL-38485 calendar: Carry over line breaks on imports
Thanks to Matthias Schwabe for the patch suggestion
2015-02-19 14:15:22 +05:30
Simey Lameze
cf34b25d59 MDL-48142 core_badge: unit tests for badge awarded event 2015-02-19 12:34:13 +08:00
Simey Lameze
4ae5ecbeef MDL-48142 core_badge: bug fixes on badge awarded event class 2015-02-19 12:32:36 +08:00