71477 Commits

Author SHA1 Message Date
Sam Hemelryk
f6c65c2575 Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle 2014-12-10 13:24:38 +01:00
Dan Poltawski
e600e6ae50 Merge branch 'MDL-47323-enrol-plugin-backup' of https://github.com/mpetrowi/moodle 2014-12-09 22:29:37 +00:00
Dan Poltawski
971f1c28a8 Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle 2014-12-09 21:22:03 +00:00
Sam Hemelryk
6009ccb2f1 Merge branch 'm29_MDL-48389' of https://github.com/totara/moodle 2014-12-10 09:27:18 +13:00
Eloy Lafuente (stronk7)
f6d955fe6b Merge branch 'MDL-31822_master' of https://github.com/dmonllao/moodle 2014-12-09 16:05:56 +01:00
Eloy Lafuente (stronk7)
0b956a64d8 MDL-46814 calendar export: Minor coding tweaks 2014-12-09 15:44:11 +01:00
Brian Barnes
a008de2a58 MDL-46814 calendar: Export calendar uses moodle forms 2014-12-09 15:44:10 +01:00
Dan Poltawski
23da79a464 MDL-45679 mod_lesson: do not overqualify styles 2014-12-09 12:34:54 +00:00
Dan Poltawski
9478d117fc Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle 2014-12-09 12:05:29 +00:00
Dan Poltawski
51019f2a91 Merge branch 'MDL-48394-master' of git://github.com/jethac/moodle 2014-12-09 10:53:41 +00:00
Dan Poltawski
c676a343a5 Merge branch 'MDL-41846-master' of git://github.com/xow/moodle 2014-12-09 10:25:15 +00:00
Sam Hemelryk
50c1f47ec4 Merge branch 'wip_MDL-36499_master' of git://github.com/gjb2048/moodle 2014-12-09 16:57:03 +13:00
Sam Hemelryk
1e12b5688c Merge branch 'wip-MDL-46486-master' of git://github.com/marinaglancy/moodle 2014-12-09 16:20:40 +13:00
Sam Hemelryk
44a4b3d072 Merge branch 'MDL-40552-master' of git://github.com/danpoltawski/moodle 2014-12-09 16:13:40 +13:00
Sam Hemelryk
54907a6a9b Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle 2014-12-09 15:58:46 +13:00
Sam Hemelryk
d5265ac28e Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign 2014-12-09 15:38:40 +13:00
Brian Barnes
9eb24f0818 MDL-48389 forms: added page title to help text 2014-12-09 15:21:06 +13:00
Sam Hemelryk
255501c900 Merge branch 'mdl48517' of https://github.com/tlevi/moodle 2014-12-09 15:15:51 +13:00
Sam Hemelryk
13ff5c990c Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle 2014-12-09 15:13:33 +13:00
David Balch
c9edde8b2d MDL-31822 course: Cleanup per coding guidelines. 2014-12-09 10:05:49 +08:00
David Monllao
fecca79d5a MDL-31822 course: Formatting the section name 2014-12-09 10:04:49 +08:00
Sam Hemelryk
3e5f4b2ca9 Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle 2014-12-09 13:43:30 +13:00
Sam Hemelryk
440d861ccb Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle 2014-12-09 12:13:26 +13:00
Sam Hemelryk
7622b02f4c Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle 2014-12-09 10:56:53 +13:00
Eloy Lafuente (stronk7)
6054036fbc Merge branch 'MDL-48255-master' of git://github.com/lameze/moodle 2014-12-08 19:14:07 +01:00
Eloy Lafuente (stronk7)
c2f1feffd6 Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle 2014-12-08 18:48:53 +01:00
Dan Poltawski
065fa16e75 Merge branch 'MDL-48410' of git://github.com/timhunt/moodle 2014-12-08 15:19:11 +00:00
Dan Poltawski
512cc4162e Merge branch 'MDL-48373' of git://github.com/timhunt/moodle 2014-12-08 15:15:35 +00:00
Dan Poltawski
d2c33655b6 Merge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle 2014-12-08 14:23:49 +00:00
Dan Poltawski
051d59e36e Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle 2014-12-08 13:34:02 +00:00
Dan Poltawski
29a9a28e57 Merge branch 'MDL-14908-master' of git://github.com/FMCorz/moodle 2014-12-08 13:22:16 +00:00
Dan Poltawski
9112aac132 MDL-48273 upgrade.txt version fix 2014-12-08 11:23:40 +00:00
Simey Lameze
f4d1dd1025 MDL-48273 singleview: unit tests of load_user method 2014-12-08 11:19:06 +00:00
Simey Lameze
aac66bef1e MDL-48273 singleview: add load_user method and other group validations
All credits goes to Damyon, thanks!
2014-12-08 11:19:06 +00:00
Dan Poltawski
aeb1fdd4e0 Merge branch 'MDL-30937_master' of https://github.com/markn86/moodle 2014-12-08 11:06:49 +00:00
David Monllao
cbebd40dfb MDL-47246 mod_forum: Limit last post restriction to Q and A 2014-12-08 14:51:36 +08:00
Mark Nelson
950d313a86 MDL-30937 report_backups: added ability to view backup logs 2014-12-07 21:18:13 -08:00
Mark Nelson
a76eef5bc0 MDL-30937 core_backup: use default log level when none specified 2014-12-07 21:18:13 -08:00
Sam Hemelryk
922d32371a Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle 2014-12-08 14:50:53 +13:00
Sam Hemelryk
22f098cd23 Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle 2014-12-08 14:24:14 +13:00
David Balch
a7aae18cf6 MDL-31822 course: Show custom Section name on Front page. 2014-12-08 09:01:01 +08:00
Sam Hemelryk
766ef7211b Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle 2014-12-08 13:58:15 +13:00
Sam Hemelryk
559d6c0046 MDL-34684: fixed whitespace issues 2014-12-08 11:16:19 +13:00
Sam Hemelryk
8b0876cc10 Merge branch 'MDL-34684_master' of git://github.com/dmonllao/moodle 2014-12-08 11:15:32 +13:00
Tony Levi
064b8b7fe3 MDL-48517: behat: Fix reset ordering reversal (MDL-48302) 2014-12-07 23:58:24 +10:30
Gregory Faller
b288570463 MDL-46172 mod/assign: Stop suspended users getting assign group emails 2014-12-06 08:24:08 +10:30
Gareth J Barnard
ffe618dcd3 MDL-36499 javascript: Expand height of the file element in embedded view. 2014-12-05 15:48:16 +00:00
Jean-Michel Vedrine
cfcfd7045f MDL-45679 mod_lesson: Essay grading page has no mark for essay status 2014-12-05 15:02:32 +01:00
Tim Hunt
8fec847ca7 MDL-48410 behat, quiz: step for efficiently adding questions 2014-12-05 12:22:28 +00:00
Tim Hunt
df44db5baa MDL-48373 behat, questions: convert tests to use the new steps
The new steps make it more efficient to create questions.

While making the changes, I took the opportunity to alter the tests to
follow Behat best practices, and only test one thing per scenario.
2014-12-05 12:22:27 +00:00