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

76213 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
10eb44f7e6 MDL-52438 core: allow Moodle 3.0 to be used with PHP7 2015-12-08 12:54:32 +08:00
Eloy Lafuente (stronk7)
ea5c18dfce weekly release 3.1dev 2015-12-03 19:40:42 +01:00
Eloy Lafuente (stronk7)
75cb235699 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-03 19:40:33 +01:00
Eloy Lafuente (stronk7)
8827b67aeb MDL-52141 backup: test restore_log_rule don't modify passed log anymore 2015-12-03 18:52:26 +01:00
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
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
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
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
Dan Poltawski
8fea53a0b1 Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle 2015-11-30 13:37:47 +00:00
Dan Poltawski
1db15fe9a7 Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle 2015-11-30 13:20:35 +00:00
Dan Poltawski
c2c97208f1 Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle 2015-11-30 12:23:09 +00:00
Dan Poltawski
88f50b3551 Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle 2015-11-30 11:27:52 +00:00
Dan Poltawski
8ffdb1309c Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle 2015-11-30 10:23:07 +00:00
David Monllao
58fe694167 Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle 
Conflicts:
	lang/en/deprecated.txt
	lang/en/grades.php
 2015-11-30 15:52:46 +08:00
David Monllao
c256bac879 Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle 2015-11-30 15:45:44 +08:00