58279 Commits

Author SHA1 Message Date
Dan Poltawski
06ae410844 Merge branch 'MDL-37078-master' of git://github.com/sammarshallou/moodle 2012-12-17 11:36:57 +08:00
Dan Poltawski
a8103b1c07 Merge branch 'MDL-37165-master' of git://github.com/damyon/moodle 2012-12-17 11:30:27 +08:00
Sam Hemelryk
6a1273cbc7 MDL-25928 course: Fixed course info on the combo list to be a popup 2012-12-17 16:03:06 +13:00
Petr Škoda
75427a824c MDL-37171 fix multiple spreadsheet related PHP4isms 2012-12-15 12:36:40 +01:00
Petr Škoda
04463c0ea6 MDL-36245 add tests for the buggy utf-8 to utf-8 conversion 2012-12-15 11:50:17 +01:00
Petr Škoda
e9a3070676 MDL-36245 try to workaround buggy iconv() when converting text from utf-8 to utf-8 2012-12-15 11:50:17 +01:00
Petr Škoda
83be0dfd57 MDL-36475 tweak zIndexes once more
The expected ranges are now:
* 0-1000 for normal code
* 5000-5999 for TinyMCE
* 7000-8999 for filepicker and filemanager

This patch fixes also incorrect location of "MDL-25736 - French spellchecker fixes." modification reminder.
2012-12-15 11:46:46 +01:00
Joseph Rezeau
26efb4888f MDL-37114 quiz form validation: feedback boundaries.
The feedback boundaries must either be a number or a percentage.
We were not correctly validating the non-percentage case.
2012-12-15 10:44:51 +00:00
Thanh Le
31f4086460 MDL-36259 course short names: ensure it displays when enabled in admin
Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on.  In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
2012-12-15 10:44:34 +00:00
Petr Škoda
57160c25d7 MDL-36493 improve timeout handling in mysql upgrade
Credit goes to Mark Nielsen, thanks.
2012-12-15 11:43:52 +01:00
Petr Škoda
801ae0f4d8 MDL-36493 improve performance of mysql unsigned/lob upgrade 2012-12-15 11:43:52 +01:00
Tim Hunt
e4ca11842b MDL-32245 question bank: fix coding style in categories.php 2012-12-15 10:41:00 +00:00
Thanh Le
87bee3bcfa MDL-32245 question bank: fix moving categories between contexts. 2012-12-15 10:40:59 +00:00
Petr Škoda
a11aa38e80 MDL-37111 copy first post files in single type forum using intro options
This patch also removed the delete button from the first post in single
discussion type forum.

Edit button in the first post leads to the forum edit page now, this should
prevent other problems throwing first post and intro out of sync.
2012-12-15 11:23:42 +01:00
Petr Škoda
dbfe415028 MDL-36597 strip '_utf8' from all course.lang fields 2012-12-15 11:13:10 +01:00
Eloy Lafuente (stronk7)
c50c84bbae MDL-37176 timezones: updated to 2012j 2012-12-14 20:06:56 +01:00
Eloy Lafuente (stronk7)
20751863e3 weekly on-sync release 2.5dev 2012-12-14 13:33:07 +01:00
Frederic Massart
1fefd1ff8d MDL-36456 repository: S3 handles errors in a nicer way 2012-12-14 17:55:56 +08:00
Damyon Wiese
0c7b691035 MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).
Oracle does not like the use of AS after a join.
2012-12-14 15:10:06 +08:00
Iñaki Arenaza
cd37c1dad8 MDL-28585 LDAP Auth doesn't handle password expiration
All credit goes to Mark Ward for proposing the initial patch.

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2012-12-14 00:10:09 +01:00
Eloy Lafuente (stronk7)
04e56da75f Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-13 10:31:59 +01:00
Jason Fowler
e9904e0988 MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field 2012-12-13 15:08:23 +08:00
Damyon Wiese
d495f2d75e MDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for oracle
This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.
2012-12-13 09:58:07 +08:00
Dan Poltawski
aa3258d586 Merge branch 'MDL-36897' of git://github.com/timhunt/moodle 2012-12-13 09:54:17 +08:00
sam marshall
79e9e6049b MDL-37078: Restore - section restore fails with multiple availability conditions 2012-12-12 10:47:17 +00:00
Davo Smith
8427de6883 MDL-37014 repository_webdav - strip the server URL from file & folder paths returned by webdav lib (if present) 2012-12-12 08:36:34 +00:00
Tim Hunt
0fe1b50c29 MDL-36897 quiz review: fixup previous commit. 2012-12-12 08:12:16 +00:00
Frederic Massart
c24cd39448 MDL-32639 files: Zipping a folder does not overwrite existing files 2012-12-12 14:38:23 +08:00
Frederic Massart
638d72cd0b MDL-32639 files: Improved File Manager download and zip support 2012-12-12 14:38:11 +08:00
Mark Nelson
cba235594a MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x 2012-12-12 13:18:02 +08:00
Sam Hemelryk
e7335920f3 MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget 2012-12-12 09:37:27 +08:00
Sam Hemelryk
abb0ce1b42 MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling users 2012-12-12 09:37:27 +08:00
Cathal O'Riordan
6d976f3f30 MDL-36644 Assignment: prepend the course upload limit to the options array
Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
2012-12-12 08:56:59 +08:00
Dan Poltawski
7ac94cab86 Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle 2012-12-12 08:43:29 +08:00
Sam Hemelryk
fa125570fb Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle 2012-12-12 11:10:05 +13:00
Eloy Lafuente (stronk7)
12e13ce047 Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle 2012-12-11 22:48:06 +01:00
Eloy Lafuente (stronk7)
4ad65dc2b6 Merge branch 'm24_MDL-36641_Missing_external_package_HTTP_check' of https://github.com/scara/moodle 2012-12-11 22:42:09 +01:00
Sam Hemelryk
31d5b2dd69 MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true 2012-12-12 09:46:45 +13:00
Sam Hemelryk
16ae43f243 Merge branch 'MDL-29805-master' of git://github.com/mouneyrac/moodle 2012-12-12 09:45:29 +13:00
Sam Hemelryk
db8625bd1e Merge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle 2012-12-12 09:38:43 +13:00
Sam Hemelryk
5514e22d52 Merge branch 'wip_master_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle 2012-12-12 09:35:27 +13:00
Sam Hemelryk
18e4963a74 Merge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle 2012-12-12 09:29:33 +13:00
Eloy Lafuente (stronk7)
771b820285 Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle 2012-12-11 19:56:31 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Dan Poltawski
02dd021d26 Merge branch 'w49_MDL-36447_m25_gdtest' of git://github.com/skodak/moodle 2012-12-11 17:54:24 +08:00
Dan Poltawski
70f4fddae5 Merge branch 'MDL-37098' of git://github.com/timhunt/moodle 2012-12-11 17:51:50 +08:00
Tim Hunt
1744033ccb MDL-37098 quiz: event handler fails deleting group with no overrides
This was a regression from MDL-35717.
2012-12-11 09:06:19 +00:00
Dan Poltawski
cba50c0088 Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle 2012-12-11 16:24:10 +08:00
Dan Poltawski
09f5d8344e Merge branch 'wip-MDL-36108-master' of git://github.com/phalacee/moodle 2012-12-11 16:03:09 +08:00
Jason Fowler
4ff849b7db MDL-36108 - Blocks - Online User block's user image's alt attribute is now empty to prevent repetition of text for screen readers 2012-12-11 15:49:50 +08:00