Commit graph

55135 commits

Author SHA1 Message Date
Petr Škoda
ed047dabc9 MDL-34271 cleanup mysql engine hack before adding similar collation hack 2012-07-12 14:39:36 +02:00
Barbara Ramiro
2ab9a06c7f MDL-33841 Min-height set to remove unnecessary scrollbar on tree and list view 2012-07-12 20:00:23 +08:00
Dan Poltawski
904673dd20 weekly release 2.4dev 2012-07-12 15:54:31 +08:00
Dan Poltawski
24ffa77f30 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-07-12 15:49:21 +08:00
Sam Hemelryk
bd1fdb6a1b Revert "MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results"
This reverts commit 440821205a.
2012-07-12 18:20:48 +12:00
Dan Poltawski
2e616b543b MDL-34153 mod_forum: create RFC-2822 compliant message-ids 2012-07-12 14:16:29 +08:00
Paul Nicholls
42648dd405 MDL-32582 - filter/multimedia: MP3 Flow Player doesn't work in Chrome if empty stylesheets are present 2012-07-12 13:39:58 +08:00
Dan Poltawski
19a8646822 MDL-33624 lang - remove incosistent use of placeholder 2012-07-12 13:10:52 +08:00
Aparup Banerjee
60829d8094 MDL-34225 course completion : moved criteria classes into criteria subdir 2012-07-12 12:04:36 +08:00
Aaron Barnes
eb8f89a976 MDL-22259 completion: Rename "Course Prerequisites" to "Completion Dependencies" 2012-07-12 15:55:34 +12:00
AMOS bot
8be8a390da Automatically generated installer lang files 2012-07-12 00:32:21 +00:00
Andrew Robert Nicols
52dc017114 MDL-33874 Allow form fields to be ignored by the formchangechecker 2012-07-12 01:09:43 +01:00
Kanika Goyal
103e7cba16 MDL-32227: Plagiarism API - add support for plagiarism api to forum module 2012-07-11 23:36:03 +05:30
Kanika Goyal
93d52d84ec MDL-32228: Plagiarism API - add support for plagiarism api to online assignment type 2012-07-11 23:04:56 +05:30
Dan Poltawski
7e1afba2ae Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 17:12:57 +08:00
Petr Škoda
00f744d2b1 MDL-33753 fix sloppy refactoring regression in zip tweaking 2012-07-11 11:10:19 +02:00
Dan Poltawski
ae5cf02259 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 2012-07-11 16:34:15 +08:00
Petr Škoda
ef7090522d MDL-8249 improve custom role strings
Credit goes to Michael de Raadt.
2012-07-11 10:29:04 +02:00
Petr Škoda
d3c0f41160 MDL-8249 fix participant page role selection
Thanks Michael de Raadt for spotting this regression.
2012-07-11 10:27:14 +02:00
David Monllao
0652b34fde MDL-28155 mod_assignment Using the this object instead of a string 2012-07-11 15:10:17 +08:00
Dan Poltawski
f04615e67b Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-11 14:51:55 +08:00
Petr Škoda
f5bd1603e2 MDL-34175 one more hardcoded /admin/ in mnet 2012-07-11 08:47:26 +02:00
Dan Poltawski
94a9c8cae1 Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-11 14:45:41 +08:00
Petr Škoda
9177036440 MDL-33454 add forgotten TinyMCE min_height setting name change 2012-07-11 08:41:06 +02:00
Aparup Banerjee
4b92f65351 MDL-26587 Question : fixed restoring shortanswer where answers are missing due to data error in mbz file. 2012-07-11 13:41:00 +08:00
Damyon Wiese
9650334f2c MDL-34258: Plagiarism API now returns strings so mod_assign needs these updates 2012-07-11 08:31:56 +08:00
Sam Hemelryk
37038fa8e1 Merge branch 'w28_MDL-33753_m24_utfunzip' of git://github.com/skodak/moodle 2012-07-11 11:33:02 +12:00
Sam Hemelryk
ee2b82d8cb Merge branch 'w28_MDL-33710_m24_utfzip' of git://github.com/skodak/moodle 2012-07-11 11:27:48 +12:00
AMOS bot
5818b36e68 Automatically generated installer lang files 2012-07-10 20:33:13 +02:00
Aaron Barnes
9710fe73d1 MDL-34243 completion: get_criteria() incorrectly passing object 2012-07-10 21:07:30 +12:00
Dan Poltawski
06dd4335aa Merge branch 'w28_MDL-33712_m24_extratags' of git://github.com/skodak/moodle 2012-07-10 15:55:58 +08:00
Dan Poltawski
c94068f215 Merge branch 'wip-MDL-33950-master' of git://github.com/marinaglancy/moodle 2012-07-10 14:56:46 +08:00
Dan Poltawski
2c0c3379fc Merge branch 'MDL-30844-master' of https://github.com/FMCorz/moodle 2012-07-10 14:47:35 +08:00
Dan Poltawski
f5d7fe4c9e MDL-34159 - add comment lost from previous commit 2012-07-10 12:59:06 +08:00
Sun Zhigang
b5b7d9d91a MDL-28155 mod_assignment - Fix an ugly hack
Show download all link for any assignment types which implement
the download_submissions() method
2012-07-10 12:57:54 +08:00
Dan Poltawski
4afbd0c834 Merge branch 'w28_MDL-34159_m24_wherelist' of git://github.com/skodak/moodle 2012-07-10 12:52:14 +08:00
Sam Hemelryk
f0d6e53c11 Merge branch 'w28_MDL-33617_m24_roleenrolindex' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 15:47:33 +12:00
Sam Hemelryk
e9c614276b Merge branch 'MDL-34237' of git://github.com/danpoltawski/moodle 2012-07-10 15:26:58 +12:00
Dan Poltawski
00142ce553 MDL-34237 - fix version number mistake 2012-07-10 11:20:33 +08:00
Sam Hemelryk
af0c360f48 Merge branch 'w28_MDL-33887_m24_jsstrings' of git://github.com/skodak/moodle 2012-07-10 15:07:47 +12:00
Aparup Banerjee
7534234322 MDL-34225 course completion : move /lib/completion/* up to /completion 2012-07-10 11:06:41 +08:00
Dan Poltawski
b445f75019 Merge branch 'MDL-34156-master' of git://github.com/micaherne/moodle 2012-07-10 10:53:16 +08:00
Sam Hemelryk
e977b391b7 Merge branch 'w28_MDL-34057_m24_styledebug' of git://github.com/skodak/moodle 2012-07-10 14:50:40 +12:00
Sam Hemelryk
8f19a94304 Merge branch 'w28_MDL-34101_m24_newaccountprev' of git://github.com/skodak/moodle 2012-07-10 14:42:28 +12:00
Dan Poltawski
4b9e493b0a Merge branch 'w28_MDL-34147_m24_cygwin' of git://github.com/skodak/moodle 2012-07-10 10:31:16 +08:00
Dan Poltawski
315e968209 MDL-8249 - tests: fix breaking unit tests 2012-07-10 10:17:47 +08:00
Dan Poltawski
029be094ab MDL-8249 - tests: fix trailing whitespace 2012-07-10 10:17:33 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 09:43:23 +08:00
Dan Poltawski
c4f48b552f Merge branch 'MDL-34171' of git://github.com/timhunt/moodle 2012-07-10 09:24:56 +08:00
Dan Poltawski
b40eca11d9 Merge branch 'w28_MDL-33018_m24_pgindex2' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-10 09:17:23 +08:00