71093 Commits

Author SHA1 Message Date
Sam Hemelryk
1f4039d84f Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges 2014-11-17 14:37:49 +13:00
Sam Hemelryk
d6abe6f744 Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle 2014-11-17 13:39:03 +13:00
Sam Hemelryk
993e61d970 Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle 2014-11-17 13:21:02 +13:00
Sam Hemelryk
0d23255b89 Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle 2014-11-17 12:48:04 +13:00
Sam Hemelryk
b83a0323da Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle 2014-11-17 12:34:02 +13:00
Sam Hemelryk
2928dfd8a0 Merge branch 'master_MDL-47993' of https://github.com/totara/moodle 2014-11-17 12:21:16 +13:00
Sam Hemelryk
57fa596e0f Merge branch 'MDL-43628' of https://github.com/scyrma/moodle 2014-11-17 11:44:57 +13:00
Sam Hemelryk
76555946a9 Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle 2014-11-17 10:34:10 +13:00
Sam Hemelryk
fea4baf826 Merge branch 'MDL-47590' of git://github.com/timhunt/moodle 2014-11-17 10:34:09 +13:00
Sam Hemelryk
6d97620481 Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle 2014-11-17 10:34:09 +13:00
sam marshall
94b084fb02 MDL-48179 Backup progress: Can time out when compressing large backup 2014-11-14 18:29:30 +00:00
Tim Hunt
ba145a9e4e MDL-47590 question backup: include response file only with userdata 2014-11-14 16:21:18 +00:00
Ankit Agarwal
74b28381c6 MDL-48171 gradebook: Use proper apis to get item name 2014-11-14 13:25:04 +05:30
Oleg Demeshev
741063b41c MDL-47993 calendar: Fix ical import Microsoft calendar issue 2014-11-14 10:32:54 +13:00
Eloy Lafuente (stronk7)
c106341098 weekly release 2.9dev 2014-11-13 12:14:36 +01:00
Eloy Lafuente (stronk7)
a5c69c900c Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-13 11:55:15 +01:00
Helen Foster
ed10b1d94d MDL-48214 Merge English strings from the en_fix language pack 2014-11-13 11:29:08 +01:00
Paul Holden
68ef378b1b MDL-44657 forms: Form identifiers should only contain basic characters 2014-11-13 16:20:28 +08:00
Andrew Nicols
14ecbb2ee8 MDL-48196 phpunit: Set e-mail address for admin user at installation 2014-11-13 08:47:43 +08:00
Eugene Venter
8309373cbf MDL-48204 mod_wiki: admin.php - fix syntax error 2014-11-13 00:46:43 +01:00
Dan Poltawski
2ee5b9cdc6 weekly release 2.9dev 2014-11-12 11:33:20 +00:00
Dan Poltawski
271045e5d4 MDL-48174 tool_langimport: info about skipped update
So admins can work out why the task might not be having an effect.
2014-11-12 11:24:21 +00:00
Dan Poltawski
bfa16aa2fa Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle 2014-11-12 11:03:43 +00:00
David Monllao
800fa051b0 MDL-30968 mod_forum: No picture link to group when no groups mode 2014-11-12 11:53:14 +08:00
Andrew Nicols
a9edd8a671 MDL-48194 testing: Adjust naming of testsuites in phpunit.xml
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
2014-11-12 11:46:03 +08:00
Sam Hemelryk
8aff36d0c8 Merge branch 'MDL-47391_master' of github.com:ninelanterns/moodle 2014-11-12 12:33:25 +13:00
Sam Hemelryk
785887fd0f Merge branch 'MDL-39692-master' of git://github.com/FMCorz/moodle 2014-11-12 09:41:58 +13:00
Yuliya Bozhko
ae17e383ef MDL-48115 badges: Fix strtoupper() output in badges
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-11-12 09:25:58 +13:00
Sam Hemelryk
06a26e54e5 Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle 2014-11-12 08:58:52 +13:00
Dan Poltawski
73f755a799 MDL-47502 statslib tests: improve test
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
2014-11-11 19:25:49 +00:00
Eugene Venter
ba923f4f9a MDL-47502 test_statslib_cron_daily: fix provider
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
2014-11-11 19:12:51 +00:00
Dan Poltawski
3194ca4b02 Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle 2014-11-11 19:05:45 +00:00
Dan Poltawski
e0fa3e952b Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle 2014-11-11 18:59:55 +00:00
Dan Poltawski
4bd5445447 Merge branch 'MDL-48168' of git://github.com/timhunt/moodle 2014-11-11 18:48:39 +00:00
Dan Poltawski
20ac3aa5e5 Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle 2014-11-11 17:21:09 +00:00
Dan Poltawski
cae0c46b9b Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle 2014-11-11 17:16:00 +00:00
Rajesh Taneja
ac19f245bf MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
2014-11-11 16:52:20 +08:00
Dan Poltawski
c69183a40f Merge branch 'MDL-48144' of git://github.com/stronk7/moodle 2014-11-11 08:07:19 +00:00
Ankit Agarwal
751c05c041 MDL-35638 backup: Do not print headers during redirects 2014-11-11 11:07:44 +05:30
Mathieu Petit-Clair
fb61433086 MDL-43628 assign: make submissionagreement usable on multilingual sites 2014-11-10 16:53:03 -05:00
Tim Hunt
080839c421 MDL-48168 quiz editing: max grade should be editable after attempts
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
2014-11-10 19:00:05 +00:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
53fd1ae5ce Merge branch 'MDL-48143' of git://github.com/stronk7/moodle 2014-11-10 17:39:54 +01:00
Eloy Lafuente (stronk7)
00c78e2623 MDL-48143 backup: Bump release to 2.9 dev branch 2014-11-10 17:32:34 +01:00
sam marshall
540af6f38e MDL-48093 HTML 5 video: Firefox now supports .mp4 2014-11-10 10:48:28 +00:00
David Mudrák
5429afc042 MDL-48156 task: Skip the scheduled task only for really disabled plugins 2014-11-10 11:09:25 +01:00
Darko Miletic
ea99201d7d MDL-39376 enrol: Optimized setting for ldap and database 2014-11-10 16:45:43 +08:00
Frederic Massart
b53a658b26 MDL-39692 grade: Little code clean up of letter boundary deletion 2014-11-10 13:00:01 +08:00
Huy Hoang
1d693611e5 MDL-39692 grade: Ability to delete letter boundary 2014-11-10 12:14:31 +08:00
James Ballard
91325ff616 MDL-47391 Update pagelayout for default profile configuration 2014-11-10 09:23:45 +11:00