54358 Commits

Author SHA1 Message Date
Aparup Banerjee
a6c3aed35d Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle 2012-06-15 14:54:10 +08:00
Dongsheng Cai
d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Dan Poltawski
ed2ed3f97e MDL-33468 - fix illegal whitespace 2012-06-15 12:17:40 +08:00
Dan Poltawski
74ef0474fc Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle 2012-06-15 12:14:49 +08:00
Dan Poltawski
d25887d440 Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle 2012-06-15 12:10:34 +08:00
Dan Poltawski
b44022782b MDL-32279 filter: fix undefined variable 2012-06-15 11:58:03 +08:00
Dan Poltawski
ccd4972636 Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle 2012-06-15 11:30:33 +08:00
Dan Poltawski
f898b935af Merge branch 'MDL-33730' of git://github.com/mouneyrac/moodle 2012-06-15 11:07:48 +08:00
Dan Poltawski
66d9586070 Merge branch 'MDL-32279' of git://github.com/stronk7/moodle 2012-06-15 11:02:47 +08:00
Frederic Massart
e7ae9c2600 MDL-33758 Filepicker: using iframe instead of popup windows for download 2012-06-15 10:12:57 +08:00
Eloy Lafuente (stronk7)
d24f821e0f MDL-32279 filters: add documentation to upgrade.txt 2012-06-15 01:24:18 +02:00
Eloy Lafuente (stronk7)
0ba48ee899 MDL-32279 glossary filter: take rid of unused courseid variable in yui module. 2012-06-14 20:08:07 +02:00
Eloy Lafuente (stronk7)
3ffb739586 MDL-32279 glossary filter: implement the setup() method. 2012-06-14 20:05:45 +02:00
Eloy Lafuente (stronk7)
6c5dbbb36b MDL-32279 filters: add support for setup() methods in filters. 2012-06-14 20:02:20 +02:00
Aparup Banerjee
8db5df0c56 Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle 2012-06-14 21:29:45 +08:00
Aparup Banerjee
6971dcf7ec Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle 2012-06-14 21:09:55 +08:00
Andrew Robert Nicols
346099f08b MDL-33731 Add exception for closebutton when drag/dropping activity chooser 2012-06-14 11:30:29 +01:00
Jerome Mouneyrac
7a38450680 MDL-33730 missing description field cause error when call is done on default values 2012-06-14 18:16:03 +08:00
Aparup Banerjee
60d3ff94db Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle 2012-06-14 17:08:18 +08:00
Frederic Massart
76055f5de4 MDL-33442 Course: actions bring you back where you came from 2012-06-14 17:07:57 +08:00
Dan Poltawski
d4401b9643 Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:32:03 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Marina Glancy
6fd1cf05b0 MDL-33550 reset repository static cache between unit tests 2012-06-14 16:21:04 +08:00
Martin Dougiamas
70b1d892ed MDL-33156 pix: standardise image icons for course pages 2012-06-14 16:04:16 +08:00
Marina Glancy
cfc4db405c MDL-33550 Set default status for file =0 and correct setting user in phpunit test 2012-06-14 14:52:31 +08:00
Dan Poltawski
414ce30812 Revert MDL-33513
This reverts commit b2cf2b807f7a7c8d1a02ebb52038c61cc63a1494.
This reverts commit 24b96f01702571989fa77a05c5cd11b9fedc2745.
This reverts commit 39c60294a6a027ae56f4b9eda159bb589b60c0c0.
This reverts commit 8a288971e25eaaa4c8cbd67e450cee0e12435d4e.
2012-06-14 13:57:45 +08:00
Sam Hemelryk
1875b6fb89 MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test 2012-06-14 17:28:26 +12:00
Sam Hemelryk
de3a460e17 MDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines siblings and doesn't reorder 2012-06-14 17:25:19 +12:00
Sam Hemelryk
778121751d Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle 2012-06-14 16:37:08 +12:00
Dan Poltawski
1ae5eb704a Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle 2012-06-14 12:29:14 +08:00
Dan Poltawski
5ab8fde00e Merge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign 2012-06-14 12:25:50 +08:00
Dan Poltawski
745b178e42 Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle 2012-06-14 12:22:39 +08:00
Dan Poltawski
a1394f429b Merge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign 2012-06-14 12:20:14 +08:00
Dan Poltawski
d21a98a633 MDL-27156 - version bump for new capability 2012-06-14 12:12:39 +08:00
Dan Poltawski
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Damyon Wiese
d9eb908d74 MDL-33718: Help text change for assignment module. 2012-06-14 11:23:27 +08:00
Dan Poltawski
cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Aparup Banerjee
38d488cea1 MDL-33400 Lib : fixed character miscount 2012-06-14 10:56:40 +08:00
Dan Poltawski
b2cf2b807f MDL-33513 repositories - fix misleading phpdocs 2012-06-14 10:55:30 +08:00
Dan Poltawski
813f6964ca MDL-33400 questionlib - minor whitespace/equality imporvement 2012-06-14 10:28:34 +08:00
Dan Poltawski
e46dfeb7fc Merge branch 'MDL-33400' of git://github.com/nebgor/moodle 2012-06-14 10:27:23 +08:00
Andrew Davis
845c2ae110 MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size() 2012-06-14 09:19:26 +07:00
Andrew Davis
1812ea3e06 MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size() 2012-06-14 09:19:25 +07:00
Andrew Davis
8ac95c279c MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions 2012-06-14 09:19:25 +07:00
Damyon Wiese
07a4677eb1 MDL-33464: Do not create a grade item on upgrade (mod_assign) because we already reassigned the old one 2012-06-14 09:14:40 +08:00
Sam Hemelryk
78338b8b0e Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle 2012-06-14 11:31:46 +12:00
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12:00
Sam Hemelryk
f90848689c Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle 2012-06-14 11:20:16 +12:00
Aparup Banerjee
0dd0f96373 MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix 2012-06-14 01:30:52 +08:00
Eloy Lafuente (stronk7)
3f2939fa3e Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle 2012-06-13 18:01:31 +02:00