mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity
72,429 Commits 36 Branches 527 Tags
Commit Graph

72429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
aa0de891d1 Merge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle 2015-03-03 16:22:01 +08:00
Andrew Nicols
6c3a06fdc7 Merge branch 'MDL-38485-master' of git://github.com/ankitagarwal/moodle 2015-03-03 16:05:03 +08:00
Andrew Nicols
596b86d6b2 Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle 2015-03-03 15:32:13 +08:00
Andrew Nicols
962d7359a3 Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle 2015-03-03 15:12:29 +08:00
Andrew Nicols
5ce0741490 Merge branch 'MDL-49247' of git://github.com/timhunt/moodle 2015-03-03 14:56:39 +08:00
Andrew Nicols
5b0f2ad976 Merge branch 'MDL-49284' of git://github.com/timhunt/moodle 2015-03-03 13:40:53 +08:00
Eloy Lafuente (stronk7)
8d9bdd28e0 MDL-49087 mdeploy: now relying on config.php documented 2015-03-03 02:45:44 +01:00
Andrew Nicols
2820930f57 MDL-49087 mnet: Ensure typeroot is in dirroot 2015-03-03 02:37:09 +01:00
Andrew Nicols
9b92620ff1 MDL-49087 mnet: Use real dataroot instead of user-provided 2015-03-03 02:37:09 +01:00
Eloy Lafuente (stronk7)
e24066ff85 Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle 2015-03-03 01:43:47 +01:00
Eloy Lafuente (stronk7)
fbc4839a0c Merge branch 'MDL-49240-master' of git://github.com/damyon/moodle 2015-03-03 01:11:16 +01:00
Eloy Lafuente (stronk7)
caa7022ed0 Merge branch 'MDL-49237-master' of git://github.com/mastnym/moodle 2015-03-02 21:41:35 +01:00
Dan Poltawski
63b0d7ab21 Merge branch 'master' of https://github.com/mitstek/moodle 2015-03-02 17:27:13 +00:00
Eloy Lafuente (stronk7)
900aa6e5fe Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle 2015-03-02 18:12:28 +01:00
Eloy Lafuente (stronk7)
aa94403ab2 Merge branch 'm29_MDL-48060' of https://github.com/totara/moodle 2015-03-02 18:05:24 +01:00
Dan Poltawski
dab0d47632 Merge branch 'master_MDL-49303' of https://github.com/danmarsden/moodle 2015-03-02 16:57:52 +00:00
Marina Glancy
1edd3d6fbf MDL-48804 core: do not set current course until login validated 2015-03-02 16:48:15 +01:00
Juan Leyva
bd3b68c8a7 MDL-48691 webservices: Check if the user must be changing password 2015-03-02 14:39:52 +00:00
Simey Lameze
b771b31e20 MDL-49084 core_tag: add capability check to flag as inappropriate action 2015-03-02 12:52:11 +00:00
Andrew Nicols
ead8b28f92 MDL-49144 blocks: Sanitise alt and title for block controls 2015-03-02 12:09:45 +00:00
Andrew Nicols
8721ed57a4 MDL-49144 blocks: Add behat test to ensury sanity of block title 2015-03-02 12:09:45 +00:00
Dan Poltawski
a8c56d1c26 Merge branch 'MDL-47911-master' of git://github.com/damyon/moodle 2015-03-02 11:06:18 +00:00
Ankit Agarwal
07323f50ff MDL-38466 filters: Redos protection and unit tests 2015-03-02 11:28:52 +01:00
Zachary Durber
a5b8265fc3 MDL-38466 filters: ReDoS protection for text to URL conversion. 2015-03-02 11:28:51 +01:00
Dan Poltawski
add310ab44 Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle 2015-03-02 09:33:40 +00:00
Brian Barnes
35fe9b8aa4 MDL-48060 messaging: Removed table from contact list 2015-03-02 09:04:04 +13:00
Tony Butler
d312bb70b4 MDL-49328 mod_choice: Include 'showpreview' field in module backup 2015-02-27 09:46:57 +00:00
Eric Merrill
4ea7da7828 MDL-47911 gradebook: Improve the performance of set_usedinaggregation 
This function is called many many times during grade calculation, so it
should be as efficient as possible.
 2015-02-27 09:46:34 +08:00
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test 
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
 2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Dan Marsden
5e437bc0c0 MDL-49303 mod_scorm: Initialise student preferences on re-entry. 2015-02-26 20:36:48 +13:00
Tim Hunt
b3d388c234 MDL-49284 formslib: fix strict validation of HTML. 2015-02-25 17:39:36 +00:00
Dan Poltawski
dba564c7db weekly release 2.9dev 2015-02-25 14:57:28 +00:00
Dan Poltawski
ecd9c732de NOBUG: Fixed file access permissions 2015-02-25 14:57:28 +00:00
Mitsuhiro Yoshida
6396b58e15 MDL-49259 lib: Fix for unzipped Japanese filename character corruption 2015-02-25 23:29:02 +09:00
Simey Lameze
2ec274f5ff MDL-48142 core_badge: final polishing on badge award event 2015-02-25 14:25:33 +00:00
Martin Mastny
7e7c15fbd1 MDL-49237 theme_base: made block calendar captions smaller in base theme 2015-02-25 15:29:39 +08:00
Martin Mastny
d70503a913 MDL-49237 theme_bootstrapbase: calendar block captions made smaller 2015-02-25 15:29:29 +08:00
Andrew Nicols
3d9c8578f7 MDL-48108 message: Use sql_concat instead of sql_concat_join 2015-02-25 14:35:17 +08:00
Andrew Nicols
cf2927ba4d Merge branch 'MDL-49046-master-fix1' of http://github.com/damyon/moodle 2015-02-25 11:58:55 +08:00
Andrew Nicols
46d508cdce Merge branch 'MDL-46238_master-fix' of git://github.com/dmonllao/moodle 2015-02-25 11:35:42 +08:00
Damyon Wiese
c95442b2ca MDL-49046 output: Make moodle_url->set_slashargument more robust 
It was throwing debugging when used on the install page (before config is generated).
 2015-02-25 11:28:24 +08:00
David Monllao
52a5d7a225 MDL-46238 course: Add newcourse param to enrol user filter 2015-02-25 11:26:18 +08:00
David Monllao
b1a1840905 MDL-46238 course: Replaces a tab for whitespaces 2015-02-25 10:11:47 +08:00
David Monllao
d84a9a322e Merge branch 'MDL-46238' of git://github.com/shashirepo/moodle 2015-02-25 09:52:30 +08:00
Andrew Nicols
db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
 2015-02-25 09:20:26 +08:00
Andrew Nicols
1725c553ac MDL-49008 lang: Revert unnecessary rename warning 
This was failing unit tests because it does not check for the presence of
the source directory first. If there is no source directory, it cannot be
moved.
 2015-02-25 08:54:45 +08:00
Eric Merrill
2909c04408 MDL-49285 quiz: Include lib.php for phpunit test 2015-02-24 14:53:46 -05:00
Dan Poltawski
86e5b0a707 Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle 2015-02-24 16:54:58 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00