mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
75,508 Commits 36 Branches 519 Tags
Commit Graph

75508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
cae31eccfd Merge branch 'MDL-50543-master' of git://github.com/jleyva/moodle 2015-10-07 11:36:21 +01:00
David Monllao
6be0240df5 Merge branch 'MDL-51567-master' of git://github.com/jleyva/moodle 2015-10-07 15:34:23 +08:00
David Monllao
5307265d0d Merge branch 'MDL-51632_echo_url' of git://github.com/moodlerooms/moodle 2015-10-07 15:24:36 +08:00
Dan Poltawski
b225215069 Merge branch 'wip-mdl-50524' of https://github.com/rajeshtaneja/moodle 2015-10-07 07:59:31 +01:00
rajesh Taneja
ac40984241 MDL-50524 behat: Fixed multiple when then and use of generator 2015-10-07 14:47:01 +08:00
David Monllao
68c3db8f5f Merge branch 'MDL-51537-master' of git://github.com/lameze/moodle 
Conflicts:
	lib/upgrade.txt
 2015-10-07 14:14:21 +08:00
David Monllao
ff93a2a6f3 Merge branch 'MDL-51526-master' of git://github.com/cameron1729/moodle 2015-10-07 13:46:40 +08:00
Cameron Ball
ec9e2d0414 MDL-51526 mail: Import PHPMailer 5.2.13 2015-10-07 13:42:40 +08:00
David Monllao
73c359572e MDL-51579 course: Bump version to update mobile service 2015-10-07 12:56:03 +08:00
David Monllao
d30255a08d Merge branch 'MDL-51579-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-10-07 12:48:03 +08:00
David Monllao
de27cf6a3f Merge branch 'wip-mdl-51285' of git://github.com/rajeshtaneja/moodle 2015-10-07 11:22:56 +08:00
David Monllao
c20c16c154 Merge branch 'MDL-51250-master-3' of git://github.com/junpataleta/moodle 2015-10-07 11:15:26 +08:00
Jun Pataleta
d264cbbb8a MDL-51250 course: Add validation for section name 2015-10-06 21:39:54 -05:00
Andrew Nicols
bbad52793b Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle 2015-10-07 10:25:56 +08:00
Marina Glancy
5667e60249 MDL-41042 coursecat: reset course contacts cache more often 2015-10-07 10:23:03 +08:00
Marina Glancy
a6d4a36388 MDL-41042 coursecat: better handle changes in coursecontact 2015-10-07 10:15:19 +08:00
Adrian Greeve
33a2512acd MDL-49028 mod_wiki: Fix for reseting pages and tags 
This will ensure that both pages and tags will be
removed when all the reset options for the wiki are
selected.
 2015-10-07 10:03:02 +08:00
David Monllao
0646f596f5 Merge branch 'MDL-51521-master' of git://github.com/cameron1729/moodle 2015-10-07 09:32:13 +08:00
David Monllao
7f9e70beaf Merge branch 'MDL-51525-master' of git://github.com/ryanwyllie/moodle 2015-10-07 09:22:31 +08:00
David Monllao
af17e8d9dd Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle 2015-10-07 09:20:13 +08:00
Andrew Nicols
dabb53c525 Merge branch 'MDL-45981-master' of git://github.com/lameze/moodle 2015-10-07 08:18:10 +08:00
Eloy Lafuente (stronk7)
b8e0dcbb7e Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle 2015-10-07 01:12:17 +02:00
Eloy Lafuente (stronk7)
cb171682ff Merge branch 'MDL-49823-master' of git://github.com/jleyva/moodle 2015-10-07 01:08:52 +02:00
Andrew Hancox
08a54173d8 MDL-50526 mod_assign: Highlight error message when user has no group 
If I set the "Require group to make submission" setting in an assignment
activity to yes, students who are not in any group are prevented from submitting
their assignment and are presented a warning instead that they should contact
their teacher. This message is now presented in an alert box.
 2015-10-06 16:41:25 +01:00
Dan Poltawski
a059ef2e9f MDL-50524 assign: improve method visibility and upgrade.txt 2015-10-06 16:32:57 +01:00
Dan Poltawski
1a5f8df5c0 Merge branch 'MDL-50524' of https://github.com/andrewhancox/moodle 2015-10-06 16:32:57 +01:00
Dan Poltawski
f5e68c2892 Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:55 +01:00
Dan Poltawski
67f2463f34 Merge branch 'MDL-51529-master' of git://github.com/damyon/moodle 2015-10-06 16:32:38 +01:00
Dan Poltawski
a6c6294091 Merge branch 'MDL-51250_master-empty-return-fix' of git://github.com/dmonllao/moodle 2015-10-06 16:32:38 +01:00
David Monllao
d1583d8e9c MDL-51250 course: No function returns in empty() 2015-10-06 16:32:38 +01:00
Dan Poltawski
13371605ed Merge branch 'MDL-51530-master' of git://github.com/ryanwyllie/moodle 2015-10-06 16:32:35 +01:00
Dan Poltawski
4ed45a18d1 Merge branch 'MDL-51532-master' of git://github.com/damyon/moodle 2015-10-06 16:32:23 +01:00
Dan Poltawski
828d23646a Merge branch 'MDL-51676-master-ltiservice_memberships' of git://github.com/mudrd8mz/moodle 2015-10-06 16:32:04 +01:00
Dan Poltawski
3228365b12 Merge branch 'MDL-51533-master' of git://github.com/damyon/moodle 2015-10-06 16:32:04 +01:00
Dan Poltawski
615c7f1923 Merge branch 'MDL-51534-master' of git://github.com/junpataleta/moodle 2015-10-06 16:32:03 +01:00
Dan Poltawski
a5bde1f85f Merge branch 'MDL-51535-master' of git://github.com/junpataleta/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
6b58b264db Merge branch 'MDL-51538-master' of git://github.com/damyon/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
8d49ad2613 Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
d540aa8c70 Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:00 +01:00
Dan Poltawski
c1604af966 Merge branch 'MDL-51588-master' of git://github.com/FMCorz/moodle 2015-10-06 16:31:36 +01:00
Dan Poltawski
4d49a32f9e Merge branch 'MDL-51578' of git://github.com/blaky/moodle 2015-10-06 16:31:35 +01:00
Dan Poltawski
2af6345a6f Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle 2015-10-06 16:31:35 +01:00
David Monllao
115ef5f91c MDL-51434 mod_scorm: Including protectpackagedownloads in unit tests 2015-10-06 16:31:35 +01:00
David Monllao
358827f0b3 Merge branch 'MDL-51656_master' of git://github.com/markn86/moodle 2015-10-06 16:31:34 +01:00
Andrew Nicols
ed845fa7fe Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle 2015-10-06 16:31:34 +01:00
Andrew Nicols
0e30fbd1c8 MDL-51461 javascript: Fix whitespace issue 2015-10-06 16:31:33 +01:00
Andrew Nicols
7a191981b6 Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle 2015-10-06 16:31:32 +01:00
Andrew Nicols
2dcbd2a27d Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle 2015-10-06 16:31:32 +01:00
Andrew Nicols
05e6215c48 Merge branch 'MDL-50805_master' of https://github.com/crazyserver/moodle 2015-10-06 16:29:14 +01:00
David Monllao
d50b4a6e16 Merge branch 'MDL-51250-master' of git://github.com/junpataleta/moodle 2015-10-06 16:26:55 +01:00