72319 Commits

Author SHA1 Message Date
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
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
Juan Leyva
12da294e3e MDL-49174 webservices: Return front page contents in get_contents ws 2015-02-19 15:08:02 +01:00
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
Andrew Nicols
4ec9e2a613 Revert "Merge branch 'MDL-49154' of git://github.com/timhunt/moodle"
This reverts commit 7a5d394e3c3e0fab8200d0867f6974d9c583d6e4, reversing
changes made to 58d5cc53604aa4181adc1cddc39114f40673a2a3.
2015-02-19 08:55:22 +08:00
Rajesh Taneja
96e4202c3e MDL-48841 admin: Behat table row should start with first row 2015-02-18 15:30:37 +08:00
David Monllao
c1d1c435f7 MDL-48883 mod_lesson: Updating mod_lesson version
Updating it to today's date instead of using
stable branches version convention.
2015-02-18 12:30:15 +08:00
David Monllao
caaeabd0f4 Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle 2015-02-18 12:26:40 +08:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
David Monllao
157643cacd Merge branch 'MDL-49034_master' of git://github.com/mattporritt/moodle 2015-02-18 09:36:22 +08:00
Eloy Lafuente (stronk7)
b9e059dcf3 Merge branch 'MDL-49211_master' of git://github.com/lazydaisy/moodle 2015-02-18 00:01:46 +01:00
Eloy Lafuente (stronk7)
e912b82704 Merge branch 'MDL-48973' of https://github.com/pauln/moodle 2015-02-17 23:51:01 +01:00
Eloy Lafuente (stronk7)
7a5d394e3c Merge branch 'MDL-49154' of git://github.com/timhunt/moodle 2015-02-17 23:44:43 +01:00
Eloy Lafuente (stronk7)
58d5cc5360 Merge branch 'MDL-49170_master' of https://github.com/totara/openbadges 2015-02-17 23:43:17 +01:00
Eloy Lafuente (stronk7)
6add8c594d Merge branch 'MDL-49182_master' of https://github.com/markn86/moodle 2015-02-17 23:38:48 +01:00
Eloy Lafuente (stronk7)
b062cd5cb1 Merge branch 'MDL-49205' of git://github.com/timhunt/moodle 2015-02-17 22:11:57 +01:00
Eloy Lafuente (stronk7)
8bd49ae9ad Merge branch 'MDL-48938-master' of git://github.com/jethac/moodle 2015-02-17 21:23:30 +01:00
Eloy Lafuente (stronk7)
40156b3bec Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle 2015-02-17 21:14:50 +01:00
Eloy Lafuente (stronk7)
10598f2485 Merge branch 'MDL-49041' of git://github.com/timhunt/moodle 2015-02-17 21:08:20 +01:00
Eloy Lafuente (stronk7)
d1b94e5437 Merge branch 'MDL-49059-split' of https://github.com/pauln/moodle 2015-02-17 20:56:45 +01:00
Eloy Lafuente (stronk7)
0a84773c52 MDL-49115 repository_s3: add endpoint default to generator 2015-02-17 16:30:43 +01:00
Eloy Lafuente (stronk7)
2d4d68073d Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle 2015-02-17 15:51:59 +01:00
David Monllao
b87374bdf7 Merge branch 'MDL-48993-master' of git://github.com/merrill-oakland/moodle 2015-02-17 17:17:36 +08:00
David Monllao
fc8f8e6e5a Merge branch 'MDL-49167-master' of git://github.com/damyon/moodle 2015-02-17 17:01:15 +08:00
David Monllao
b40fc76b97 MDL-48991 gradebook: Return value according to coding style 2015-02-17 16:49:45 +08:00
David Monllao
dfdb99d9d5 Merge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle 2015-02-17 16:42:51 +08:00
Dan Bennett
d908797918 MDL-49115 repository_s3: Fixed endpoint not saving 2015-02-17 15:43:13 +08:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
Andrew Nicols
719f7345ee Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle 2015-02-17 14:35:38 +08:00
Ankit Agarwal
bbcd308340 MDL-48559 behat: Moving cronclionly to the installer 2015-02-17 14:33:56 +08:00
David Monllao
c8171c1d72 Merge branch 'MDL-48841-master' of git://github.com/lucisgit/moodle 2015-02-17 14:23:22 +08:00
Andrew Nicols
cbae4e39ea Merge branch 'wip-mdl-48670' of https://github.com/rajeshtaneja/moodle 2015-02-17 14:07:55 +08:00
David Monllao
0e9a99f449 Merge branch 'MDL-49169_master' of git://github.com/grabs/moodle 2015-02-17 14:01:00 +08:00
David Monllao
a50840db34 Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle 2015-02-17 13:23:30 +08:00
David Monllao
77b0238bdb Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle 2015-02-17 13:16:39 +08:00
David Monllao
bbc009f26c MDL-48543 filter_mathjaxloader: Fixing upgrade version 2015-02-17 11:00:52 +08:00
Damyon Wiese
b1a55c5ffb MDL-48543 Mathjax: Update default config for JAWS Math player
JAWS Maths player does not recognise the math content when manually specifying the config for MathJax.
If you use one of the default config files it works.
So - we switch our config to the Accessible.js config that it is based off anyway.
There are no features changes with this approach.

Conflicts:
	filter/mathjaxloader/version.php
2015-02-17 10:54:12 +08:00
David Monllao
be1bc2d4cb MDL-48760 filter_mathjaxloader: Removing post-2.9 release comment 2015-02-17 10:48:06 +08:00
David Monllao
57ff8d92f9 Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle 2015-02-17 09:17:10 +08:00
David Monllao
a27b8c9b3b Merge branch 'MDL-48559-master' of git://github.com/ankitagarwal/moodle 2015-02-16 16:51:51 +08:00
David Monllao
73152e4dff Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle 2015-02-16 16:38:34 +08:00
Michael Hughes
3a1cc9475d MDL-48215 gradingform_guide: Name length validation
Validating both criterion name and guide name to be 255 chars.
2015-02-15 21:52:12 -08:00