moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76479 commits 37 branches 540 tags 1.3 GiB
Commit graph

76479 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
ef53650e8a NOBUG: Fixup commit to fix stuff wrongly changed on merge commits 
On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.

In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
 2015-12-03 18:52:25 +01:00
David Monllao
f2304bfb81 Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle 2015-12-03 18:52:24 +01:00
Dan Poltawski
53907dbee5 Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle 2015-12-03 18:52:21 +01:00
Dan Poltawski
ed0c32da08 Merge branch 'MDL-48451-behat-tests' of github.com:ryanwyllie/moodle 2015-12-03 18:51:47 +01:00
Ryan Wyllie
360c7917f6 MDL-48451 report_outline: additional behat coverage 2015-12-03 18:51:46 +01:00
David Monllao
200ab5266a Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/upgrade.txt
 2015-12-03 18:51:42 +01:00
Andrew Nicols
6e8e992d37 Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle 2015-12-03 18:50:03 +01:00
David Monllao
76bcec2cb1 Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle 2015-12-03 18:50:02 +01:00
David Monllao
935b954b5b Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle 2015-12-03 18:50:01 +01:00
AMOS bot
8e3c608698 Automatically generated installer lang files 2015-12-04 00:04:11 +08:00
jinhofer
4ebdd15487 MDL-51483 lib/moodlelib.php: Added conditional checks to shorten_text 2015-12-03 10:00:08 -06:00
Juan Leyva
bc7b1a3d4d MDL-52399 webservice: Add core_notes_delete_notes to the mobile service 2015-12-03 13:02:56 +01:00
Mark Nelson
d950ba1b3c MDL-52017 enrol_self: always check password before re-enabling 2015-12-03 19:26:22 +08:00
Eloy Lafuente (stronk7)
b4153ff09d Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle 2015-12-03 11:16:34 +01:00
David Monllao
38e0faafc2 Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle 2015-12-03 11:16:33 +01:00
Eloy Lafuente (stronk7)
40cd9f9ac9 Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle 2015-12-03 11:16:33 +01:00
Dan Poltawski
b80ede13a6 MDL-51664 externalib: clarify crucial comment 2015-12-03 11:16:32 +01:00
Dan Poltawski
50901a53bc Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle 2015-12-03 11:16:30 +01:00
Dan Poltawski
551088fcd7 MDL-52292 testing: block generator fix 
Stop errors when no $options supplied
 2015-12-03 11:13:28 +01:00
Dan Poltawski
16c361d9d1 MDL-48451 report_outline: add basic coverage of distinct users 2015-12-03 11:13:27 +01:00
Dan Poltawski
b56a046175 Merge branch 'MDL-48451' of https://github.com/andrewhancox/moodle 2015-12-03 11:13:26 +01:00
Dan Poltawski
0ad66dda0e Merge branch 'MDL-52292' of git://github.com/timhunt/moodle 2015-12-03 11:13:26 +01:00
Dan Poltawski
fc3c595d51 MDL-26935 behat: add coverage for role renaming in course 2015-12-03 11:13:25 +01:00
Eloy Lafuente (stronk7)
7828bb972e Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle 2015-12-03 11:13:07 +01:00
Russell Smith
a8137ec25f MDL-52141 backup: Ensure we don't alter the log record when parsing it. 2015-12-03 11:11:07 +01:00
Dan Poltawski
b7f54e5c79 Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle 2015-12-03 11:11:06 +01:00
Dan Poltawski
8e9dc75e6c Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle 2015-12-03 11:11:06 +01:00
Oleg Sychev
87b2ed6c1f MDL-51746 accesslib: Describe instanceid in context_something::instance 
With no PHPDocs and $instanceid as name some module developers confuse
context_module::instance argument to be instanceid of the module while
it actually should be cmid.
 2015-12-03 11:11:05 +01:00
David Monllao
0ee52b8214 Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
3c2f70aeb6 Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle 2015-12-03 11:11:04 +01:00
Dan Poltawski
c20577b9f2 Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle 2015-12-03 11:11:03 +01:00
David Monllao
00419a7a0b Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle 2015-12-03 11:11:02 +01:00
Rajesh Taneja
8509c4700b MDL-52376 behat: Add 1 sec delay to ensure cron works 
course completion record should be created at time
which is before the time cron is run. On fast machine
this both might be done at same time. So added 1 sec delay
 2015-12-03 13:17:03 +08:00
Cameron Ball
ea3aa9f9a0 MDL-51257 messages: Improve message form. 
- Add sudmit button
- Add formchangechecker
- Update behat tests
 2015-12-03 10:20:55 +08:00
Marina Glancy
83bef8dabb MDL-52335 tool_uploaduser: php7 compatibility in variable syntax 2015-12-03 09:31:25 +08:00
Marina Glancy
67efc377f4 MDL-52335 mod_data: php7 compatibility in variable syntax 2015-12-03 09:31:25 +08:00
Marina Glancy
ccfd168a6d MDL-52335 mod_lti: php7 compatibility in variable syntax 2015-12-03 09:31:20 +08:00
Marina Glancy
f9ba07133a MDL-52335 core: php7 compatibility in XMPP library 2015-12-02 14:00:58 +08:00
Frederic Massart
4879477632 MDL-51700 ajax: Clean the external function return values 2015-12-02 10:30:01 +08:00
Tim Hunt
eb3884e48f MDL-52292 block testing generators: improve the API 
* Refactor the block generator base class, to remove the amount
  of duplication required in base classes.

* Change the defaults that are filled in to be a little more natural.

* Make the Behat step 'Given the following "block" exist:' work.
 2015-12-01 13:48:08 +00:00
Dan Poltawski
8f2c99d610 MDL-52370 role: purge coursecontacts when role is edited 
This is perhaps a bit more brutal purge than you'd like, but it only
affects coursecat role edits.
 2015-12-01 13:14:14 +00:00
Dan Poltawski
29d4cc656f MDL-52370 course: purge contacts cache on role rename 
Previously teachers would rename roles and the change would not be
reflected in course listings.
 2015-12-01 12:44:34 +00:00
Rajesh Taneja
0049d2591b MDL-52357 behat: add 2 sec delay to ensure window is stable 2015-12-01 15:45:05 +08:00
Ankit Agarwal
c917b53a8d MDL-50269 deprecations: Properly deprecate notify() 2015-12-01 15:29:33 +08:00
Eloy Lafuente (stronk7)
e070165f57 Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle 2015-12-01 00:50:10 +01:00
Eloy Lafuente (stronk7)
71a2aaabd4 Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle 2015-11-30 23:52:45 +01:00
Dan Poltawski
20232ed9a9 Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle 2015-11-30 15:42:58 +00:00
Dan Poltawski
92efb347b0 Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle 2015-11-30 15:29:29 +00:00
Dan Poltawski
ca593e5f69 Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle 2015-11-30 15:25:22 +00:00
Dan Poltawski
df64cfa624 Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle 2015-11-30 13:50:22 +00:00