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

77441 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
a96bf448b8 Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-12-22 16:23:33 +08:00
Rajesh Taneja
e487a51db3 MDL-52060 phpunit: Keep track of modified database for reset 
Keep list of modified tables, so they can be reset
without any guess work
 2015-12-22 15:37:40 +08:00
Andrew Nicols
64f4889ad1 Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle 2015-12-22 15:13:38 +08:00
Andrew Nicols
9d926d1f27 Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle 2015-12-22 13:51:14 +08:00
Mark Nielsen
e61a9638f1 MDL-52060 phpunit: Improve get_message_processors reset 2015-12-22 13:40:39 +08:00
Mark Nielsen
d494306de7 MDL-52060 phpunit: Prevent querying database metadata 2015-12-22 13:40:38 +08:00
Rajesh Taneja
22d55b3950 MDL-52060 phpunit: Check file only if needed 2015-12-22 13:19:06 +08:00
Rajesh Taneja
44121fbdc9 MDL-52060 phpunit: Keep track of initial reset sequence 2015-12-22 13:19:06 +08:00
Andrew Nicols
ec68e9d530 Merge branch 'MDL-23128-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:11:27 +08:00
Andrew Nicols
3390f40ab7 Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle 2015-12-22 12:33:57 +08:00
David Monllao
4b6b84d677 Merge branch 'wip-mdl-52376' of git://github.com/rajeshtaneja/moodle 2015-12-22 11:24:45 +08:00
David Monllao
39604f212e Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle 2015-12-22 11:16:36 +08:00
Rajesh Taneja
c2df9b3b90 MDL-52427 behat: Fixed question selectors 
As class is changed, we need to convert selector
to check if class is contained, rather then checking
selecting with specific class.
 2015-12-22 10:43:22 +08:00
Stephen Bourget
bf5a27ce17 MDL-51445 Chat: Fix broken profile links 2015-12-21 20:37:54 -05:00
Andrew Nicols
8dccd20f76 Merge branch 'MDL-52334' of git://github.com/aolley/moodle 2015-12-22 08:45:30 +08:00
Dan Poltawski
bf47ce5050 Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle 2015-12-21 16:47:18 +00:00
Dan Poltawski
43fcd55e0c Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle 2015-12-21 16:45:15 +00:00
Juan Leyva
6a03246999 MDL-52556 mod_scorm: Return SCO extra data in get_scorm_scoes 2015-12-21 15:42:58 +01:00
Dan Poltawski
2c10892c9e Merge branch 'MDL-52427' of git://github.com/timhunt/moodle 2015-12-21 13:27:38 +00:00
Dan Poltawski
77d0aaa5e3 Merge branch 'MDL-52402' of git://github.com/mr-russ/moodle 2015-12-21 12:46:20 +00:00
Dan Poltawski
07f8dd4314 Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle 2015-12-21 12:45:30 +00:00
Dan Poltawski
36381280c5 Merge branch 'MDL-52455' of git://github.com/timhunt/moodle 2015-12-21 12:43:01 +00:00
Dan Poltawski
7fe67ef4ad Merge branch 'MDL-52542' of git://github.com/timhunt/moodle 2015-12-21 11:05:40 +00:00
David Monllao
2f3ebc9bdb Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle 2015-12-21 17:32:34 +08:00
David Monllao
355570f9e7 Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle 2015-12-21 17:16:54 +08:00
David Monllao
20b3638322 Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle 2015-12-21 17:05:48 +08:00
Dan Poltawski
5cbc9819fd Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle 2015-12-21 08:31:55 +00:00
David Monllao
a49fd98349 MDL-52226 tests: Fix behat phpunit naming conflict 2015-12-21 16:27:23 +08:00
Dani Palou
c1baf89e57 MDL-51886 wiki: Add unit tests for view_wiki and view_page 2015-12-21 08:19:24 +01:00
Dani Palou
557b58b099 MDL-51886 wiki: New WS mod_wiki_view_wiki and mod_wiki_view_page 2015-12-21 08:19:24 +01:00
David Monllao
f08d1590c8 Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle 2015-12-21 14:41:21 +08:00
Andrew Nicols
3adcec2b70 Merge branch 'master_MDL-50972' of https://github.com/danmarsden/moodle 2015-12-21 14:01:17 +08:00
Andrew Nicols
1f1894c973 Merge branch 'MDL-52457-master' of git://github.com/jleyva/moodle 2015-12-21 11:58:59 +08:00
David Monllao
f447759a91 Merge branch 'MDL-47106' of git://github.com/timhunt/moodle 2015-12-21 11:32:56 +08:00
David Monllao
5303fb94ef Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle 2015-12-21 11:14:09 +08:00
David Monllao
58920c8e53 Merge branch 'MDL-52523' of git://github.com/timhunt/moodle 2015-12-21 10:47:49 +08:00
AMOS bot
56bc2a5740 Automatically generated installer lang files 2015-12-20 00:05:04 +08:00
Michael Aherne
189875242e MDL-52560 badges: Avoid trying to add badges when disabled 2015-12-18 14:13:32 +00:00
Dan Poltawski
ea3ebbf20e weekly release 3.1dev 2015-12-18 12:26:50 +00:00
Dan Poltawski
3340ff86fe Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-18 12:26:46 +00:00
sam marshall
92cce140ed MDL-52558 Data generator: enrol_user should allow shortname 2015-12-18 11:01:15 +00:00
Dan Poltawski
1703917824 Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle 2015-12-18 10:51:01 +00:00
David Monllao
342f1ab28d MDL-52553 question: Adding missing required constants 2015-12-18 14:44:51 +08:00
Shamim Rezaie
e83bcc1050 MDL-52380 mod_forum: Non-Gregorian dates in forum advance search 
Convert the fromdate and todate date parts to Gregorian before passing them to make_timestamp
 2015-12-17 18:00:57 -06:00
Shamim Rezaie
40a6393ea5 MDL-52354 select_time: Make select_time respect the set calendar type 
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
 2015-12-17 17:58:39 -06:00
Shamim Rezaie
2bb196ebe3 MDL-52354 select_time: Make select_time respect the set calendar type 
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
 2015-12-17 15:48:27 -06:00
Eloy Lafuente (stronk7)
56e6d6608a Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle 2015-12-17 10:18:34 +01:00
Tim Hunt
3ca956b629 MDL-52542 qtype_multianswer: field names must match string placeholders 2015-12-17 08:36:08 +00:00
Rajesh Taneja
c00667550b MDL-52540 behat: mouse events are not handled well with phantomjs 2015-12-17 12:05:19 +08:00
Hagey, Nathanial
3ef6e46081 MDL-45712 mod_scorm: add results column to interactions report. 2015-12-16 13:30:50 +13:00