71463 Commits

Author SHA1 Message Date
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
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
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
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
Tim Hunt
0db16e082f MDL-48373 behat: generators for questions and categories 2014-12-05 12:22:27 +00:00
Tim Hunt
dd2e1c222a MDL-48373 behat: find table columns better.
It was not possible to select the question bank 'Created by'
or 'Modified by' columns without this change.
2014-12-05 12:22:26 +00:00
Tim Hunt
4e4c8d3a27 MDL-48373 behat: new container selector for list items. 2014-12-05 12:22:26 +00:00
Eloy Lafuente (stronk7)
2d84748c26 weekly release 2.9dev 2014-12-05 11:05:11 +01:00
Eloy Lafuente (stronk7)
cd8cefe902 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-12-05 11:05:06 +01:00
Nicolas Dunand
0ac6a57ec5 MDL-26017 enrol: Add keyholder role 2014-12-05 08:41:01 +01:00
Mark Nielsen
0802d98a7f MDL-48058 core_message: Default message outputs: Maintain Forced status 2014-12-05 14:42:18 +08:00
Paul Nicholls
1461aee88a MDL-43996 editor_atto: add image drag and drop capability
Adds the ability to drag and drop images directly into Atto, uploading the image and embedding it
correctly. Contains fixes from 1.0.2, as well as a policy change - images dragged and dropped into
Atto now have role=presentation by default.
2014-12-05 11:32:32 +08:00
John Okely
be305dc13a MDL-41846 repository_url: Escape > < ' " in input url
And throw an exception when a url is incorrectly formatted
2014-12-05 11:15:30 +08:00
John Okely
80a0fee266 MDL-41846 repository_url: Convert spaces to %20 in input url 2014-12-05 10:24:46 +08:00
Marina Glancy
769496373e MDL-21724 course: fixed wrong string in behat test 2014-12-04 12:14:32 +00:00