Commit graph

54610 commits

Author SHA1 Message Date
David Mudrak
927cb51166 MDL-32329 plugin manager returns plugins with unsatisfied dependencies 2012-05-30 10:35:28 +02:00
Aparup Banerjee
e4b5455738 Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle 2012-05-30 15:18:59 +08:00
Aparup Banerjee
380d472314 Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle 2012-05-30 14:22:34 +08:00
Dan Poltawski
2605112e0b Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle 2012-05-30 14:14:50 +08:00
Barbara Ramiro
7c3e665289 MDL-33218 Filepicker repository and toolbar aligned for IE 2012-05-30 13:56:34 +08:00
Sam Hemelryk
378eb6f6a2 Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"
This reverts commit a09a9be812, reversing
changes made to 08e0aaa173.
2012-05-30 16:34:11 +12:00
Dan Poltawski
d88f1a51fc Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 11:45:32 +08:00
Rossiani Wijaya
6b0e5f4d6d MDL-32766 course view section log: fixed the forth param for restore rule specification to use course_section 2012-05-30 15:41:07 +12:00
Dan Poltawski
7fd264b0d1 Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle 2012-05-30 11:35:56 +08:00
Sam Hemelryk
6fbe06e530 Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 15:26:27 +12:00
Dan Poltawski
0a16fa45ec Merge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle 2012-05-30 11:03:11 +08:00
Marina Glancy
f1bd371c79 MDL-33373 fixed bug in backup of files as a regression from MDL-28666 2012-05-30 10:11:41 +08:00
Frederic Massart
322945e9ca MDL-33184 Filepicker: rephrased drag and drop sentence 2012-05-30 10:05:10 +08:00
Dan Poltawski
7e82553331 Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle 2012-05-30 09:38:22 +08:00
Aaron Barnes
28e0c239ec MDL-33398 completion: Fix coding error (should be arrays not objects) 2012-05-30 13:27:51 +12:00
Damyon Wiese
0047693f09 MDL-33385: Assignment plugin settings not visible in admin tree.
* Also fixes a regression where file_submissions were not set to default for new installs.
2012-05-30 09:01:11 +08:00
Damyon Wiese
7ee1548acb MDL-33414: The setting $showviewlink needs to be passed by reference
This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)
2012-05-30 08:37:56 +08:00
AMOS bot
64f812f924 Automatically generated installer lang files 2012-05-30 00:31:17 +00:00
Eloy Lafuente (stronk7)
294d976e28 MDL-33326 filestorage tests: Coding style fixes 2012-05-30 02:26:57 +02:00
Dan Poltawski
996f8b6442 MDL-33326 filestorage tests: Add more coverage 2012-05-30 02:26:46 +02:00
Dan Poltawski
7c89a18fca MDL-33326 filestorage tests: Actually verify results
Rather than the placeholder tests which were added before to trigger
DB incompatibilities
2012-05-30 02:26:36 +02:00
kordan
311300e208 MDL-3389 mod_book: changed "Summary" to "Description" in mod_form 2012-05-29 19:23:33 +02:00
Andrew Davis
eb9f06f9c1 MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php 2012-05-29 16:38:42 +07:00
Aparup Banerjee
7df02eacf7 Merge branch 'MDL-32779' of git://github.com/danpoltawski/moodle 2012-05-29 17:11:11 +08:00
Aparup Banerjee
4fe0673c48 Merge branch 'MDL-33375' of git://github.com/danpoltawski/moodle 2012-05-29 17:06:19 +08:00
Dan Poltawski
2bb9e53106 MDL-32779 course/format: Return to correct section
When editing a single section mode item
2012-05-29 16:54:04 +08:00
Aparup Banerjee
5eb80ab73d Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle 2012-05-29 16:43:39 +08:00
Aparup Banerjee
95a8956884 Merge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle 2012-05-29 16:31:26 +08:00
Rajesh Taneja
e7b24943e6 MDL-27120 backup: fixed docblock and code cleanup 2012-05-29 16:22:45 +08:00
Dan Poltawski
076fbeb136 Merge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle 2012-05-29 16:20:21 +08:00
Dan Poltawski
038c47f6e7 Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle 2012-05-29 16:10:59 +08:00
Dan Poltawski
96601152f2 Merge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle 2012-05-29 15:56:28 +08:00
Dan Poltawski
02796eab69 Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle 2012-05-29 15:40:36 +08:00
Dan Poltawski
786cd60ee3 Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
Conflicts:
	course/format/weeks/format.js
	course/format/weeks/lib.php
2012-05-29 15:21:55 +08:00
Dan Poltawski
05d80ae6cd Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle 2012-05-29 15:12:38 +08:00
Dan Poltawski
0ed8a933d6 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-29 15:08:46 +08:00
Dan Poltawski
9856d05c26 Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle 2012-05-29 15:00:21 +08:00
Frederic Massart
a960dfa900 MDL-33397 Filepicker: cancel button always present in private files 2012-05-29 15:00:19 +08:00
Dan Poltawski
fa31bfc181 Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle 2012-05-29 14:58:31 +08:00
Dan Poltawski
e73b42ca57 Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle 2012-05-29 14:57:05 +08:00
Tony Levi
7f98b12f91 MDL-27120: Cache DB operations in restore_dbops 2012-05-29 14:44:07 +08:00
Tony Levi
066af1bbc7 MDL-27120: Cache dirname transformations in progressive_parser::dirname 2012-05-29 14:44:07 +08:00
Adam Olley
28729e23a4 mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders() 2012-05-29 14:44:07 +08:00
Jason Ilicic
ec404105ae mdl-27120 Fixed incorrect variable in parameter when adding form dependencies. 2012-05-29 14:44:07 +08:00
Ashley Holman
d729ef29cf MDL-27120 Add global cache to backup_xml_transformer::register_link_encoders() 2012-05-29 14:44:07 +08:00
Ashley Holman
631764ea2f MDL-27120 More efficient use of QuickForms in backup UI 2012-05-29 14:44:06 +08:00
Ashley Holman
f213bbd77a MDL-27120 backup: replace sequential scan search with hash-based lookup. 2012-05-29 14:44:06 +08:00
Aparup Banerjee
7f1fcda5ad Revert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle"
MDL-27120 backup: reverting due to phpunit failure at backup/converter/moodle1/tests/fixtures/lib_test.php test_stash_storage()

This reverts commit c70b7fd81f, reversing
changes made to e6f5528585.
2012-05-29 14:29:09 +08:00
Martin Dougiamas
5fece0f28d MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page 2012-05-29 12:58:24 +08:00
Sam Hemelryk
849b9a6af7 MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts 2012-05-29 16:44:28 +12:00