mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 15:02:41 +02:00
Code Issues Projects Releases Wiki Activity
71,436 Commits 36 Branches 528 Tags
Commit Graph

71436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marina Glancy
769496373e MDL-21724 course: fixed wrong string in behat test 2014-12-04 12:14:32 +00:00
Andrew Nicols
06e23acc88 MDL-48309 mod_forum: Do not escape ampersands in plain text email 2014-12-04 12:14:32 +00:00
Sam Hemelryk
c62d077b0e MDL-21724 course: fixed handling of returnto=0 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
David Monllao
ef5b65dae4 MDL-48285 calendar: Adapting unit tests to the new behaviour 
Testing also the default value including repeated events.
 2014-12-04 12:14:31 +00:00
Eloy Lafuente (stronk7)
010c36e9e2 Merge branch '48425-48374-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
a610c9abac MDL-48374 behat: Added missing $session 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
eb9419c8e2 Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle 2014-12-04 12:14:30 +00:00
Eloy Lafuente (stronk7)
f889c45159 MDL-26226 course: force version bump for new setting 2014-12-04 12:14:29 +00:00
Eloy Lafuente (stronk7)
8b9bb799f9 Merge branch '21724-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:29 +00:00
Eloy Lafuente (stronk7)
fca0b79d18 Merge branch '23178-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:14:28 +00:00
Sam Hemelryk
101348192b Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle 
Conflicts:
	mod/imscp/module.js
 2014-12-04 12:14:26 +00:00
Dan Poltawski
13e0300961 Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:06:04 +00:00
Rajesh Taneja
9f3a68fe61 MDL-48374 behat: Check flag before searching for span on page 2014-12-04 12:04:37 +00:00
Andrew Nicols
1b2c35af34 MDL-48374 behat: improved page load detection 
Check that page load detection was correctly started before testing that a
new page was loaded.

Without this, it is possible to have mutliple subsequent cases of:
    And a new page should have loaded since I started watching

Without first starting the page load detection.
 2014-12-04 12:04:36 +00:00
Helen Foster
946f83b04b MDL-36236 caching: improved help string 
(and Dan keeping codechecker happy)
 2014-12-04 12:04:12 +00:00
Dan Poltawski
4592f67789 Merge branch '36236-29' of git://github.com/samhemelryk/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
ddb483a468 Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
690a634156 Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle 2014-12-04 12:04:11 +00:00
Dan Poltawski
2852a9a0aa Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle 2014-12-04 12:04:10 +00:00