mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 23:51:15 +01:00
Code Issues Projects Releases Wiki Activity
72,294 Commits 36 Branches 527 Tags
Commit Graph

72294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Monllao
470e087d80 Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle 2015-02-16 11:52:50 +08:00
Damyon Wiese
0bb431e3ac MDL-49167 YUI: Fix for theme/yui_combo.php and $CFG->yuislashargs 
It was too aggressively cleaning it's params (broken in MDL-48980).
 2015-02-16 11:26:31 +08:00
Frederic Massart
308e481ce8 MDL-47529 lock: Fix typo on lock factory in config-dist 2015-02-16 10:53:45 +08:00
David Monllao
36977d39d0 Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle 2015-02-16 10:35:06 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Yuliya Bozhko
aebac578db MDL-49170 badges: Backpack connection missing a port colon in URL 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2015-02-16 09:32:54 +13:00
Jean-Michel Vedrine
fc16a1acba MDL-48709 mod_lesson: subclusters are not working 2015-02-14 18:26:03 +01:00
Tim Hunt
f0edd9d8f6 MDL-49205 behat: fix I set the field with xpath fail message. 2015-02-13 16:15:49 +00:00
Adrian Greeve
01dfdf7e41 MDL-48760 maths filters: Upgrade to mathjax 2.5 2015-02-13 14:26:11 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed 
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
 2015-02-13 11:12:12 +05:30
David Monllao
667ef02858 MDL-18553 mod_lesson: Requiring just the grade constants 2015-02-13 10:40:47 +08:00
Jean-Michel Vedrine
49aaac3e6f MDL-18553 Lesson: No gradeinfo display if lesson grade is zero 2015-02-13 10:28:00 +08:00
Paul Nicholls
10fae2779e MDL-48973 Atto: Atto does not listen to the drop event 
The 'drop' event fires before the native ContentEditable drop handler, so
in order to update the underlying textarea we need to call updateOriginal
with a brief delay so that the dropped content has actually been added to
the editor.
 2015-02-13 14:48:12 +13:00
Mark Nelson
5962f0df5d MDL-49182 core_course: minor changes to deleting section strings 2015-02-12 17:16:56 -08:00
Rajesh Taneja
02fafff411 MDL-48670 behat: Set timezone to Australia/perth 
Behat tests might rely on time related tests
Ensure we have default timezone set to Australia/Perth
 2015-02-13 08:11:53 +08:00
Eric Merrill
deb7f93af8 MDL-48993 gradebook: When importing new items, treat blank or - as empty 2015-02-12 17:17:06 -05:00
Eric Merrill
502aa0fbfd MDL-48991 gradebook: Fix style problems 2015-02-12 16:49:17 -05:00
Matt Switlik
cf0af62603 MDL-48991 gradebook: Properly import multiple new grade items 
Work done in MDL-46547 caused a problem where multiple new grade items
were not imported. Fix up the passing of new grade objects.
 2015-02-12 16:06:59 -05:00