Charles Fulton
63f329cad5
MDL-35130 shibboleth: remove hard-coded string
2012-12-20 10:28:23 -08:00
Eloy Lafuente (stronk7)
20751863e3
weekly on-sync release 2.5dev
2012-12-14 13:33:07 +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
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
Tim Hunt
0fe1b50c29
MDL-36897 quiz review: fixup previous commit.
2012-12-12 08:12:16 +00: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
Damyon Wiese
1e4bd9fe25
MDL-30700 Assignment 2.2: Added text_sorting function to tablelib
...
Allows oracle to sort by text (clob) columns (should be used sparingly).
2012-12-11 15:42:24 +08:00
Dan Poltawski
6236442aad
Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle
2012-12-11 15:18:50 +08:00
Dan Poltawski
c3c2fc538a
Merge branch 'MDL-36712-master' of git://github.com/damyon/moodle
2012-12-11 14:00:25 +08:00
Dan Poltawski
021504b547
Merge branch 'MDL-36591-master' of git://github.com/damyon/moodle
2012-12-11 13:56:28 +08:00
Dan Poltawski
0fd3fb0c83
Merge branch 'MDL-36897' of git://github.com/timhunt/moodle
2012-12-11 13:54:15 +08:00
Dan Poltawski
4cc8e8cbb1
Merge branch 'MDL-34791-master' of git://git.luns.net.uk/moodle
2012-12-11 13:22:42 +08:00
Dan Poltawski
358414748c
Merge branch 'MDL-36808-master' of git://github.com/sammarshallou/moodle
2012-12-11 12:18:12 +08:00
Dan Poltawski
4889da2199
Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle
2012-12-11 12:09:10 +08:00
Dan Poltawski
624b0c3f1d
Merge branch 'w49_MDL-36892_m25_enrolreadme' of git://github.com/skodak/moodle
2012-12-11 12:07:06 +08:00
Dan Poltawski
cdb7110f72
Merge branch 'MDL-36845' of git://github.com/timhunt/moodle
2012-12-11 11:58:44 +08:00
Dan Poltawski
fa18df40c1
Merge branch 'MDL-36828' of https://github.com/aolley/moodle
2012-12-11 11:44:11 +08:00
Dan Poltawski
b62f0f8d82
Merge branch 'wip-MDL-36110-master' of git://github.com/phalacee/moodle
2012-12-11 11:32:53 +08:00
Dan Poltawski
595282dfcc
Merge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle
2012-12-11 11:17:29 +08:00
Sam Hemelryk
6e68a3a93c
Merge branch 'MDL-36650' of git://github.com/timhunt/moodle
2012-12-11 16:11:13 +13:00
Dan Poltawski
5d44e45264
Merge branch 'MDL-36025-negative-zero' of git://github.com/mpetrowi/moodle
2012-12-11 11:06:28 +08:00
Sam Hemelryk
0aed7e7d71
Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle
2012-12-11 16:04:31 +13:00
Dan Poltawski
74bf44284a
Merge branch 'MDL-35476-master' of git://github.com/damyon/moodle
2012-12-11 10:49:12 +08:00
Sam Hemelryk
fc6acfe242
Merge branch 'MDL-36905' of git://github.com/rwijaya/moodle
2012-12-11 15:44:37 +13:00
Sam Hemelryk
9a8b79864a
Merge branch 'MDL-36916' of git://github.com/timhunt/moodle
2012-12-11 15:42:13 +13:00
Dan Poltawski
6434a6c76e
Merge branch 'MDL-34052-master' of https://github.com/damyon/moodle
2012-12-11 10:39:19 +08:00
Sam Hemelryk
159537f65a
Merge branch 'w49_MDL-36936_m25_composerdev' of git://github.com/skodak/moodle
2012-12-11 15:35:07 +13:00
Dan Poltawski
d4b2190728
Merge branch 'w49_MDL-31424_m25_paypalcase' of git://github.com/skodak/moodle
2012-12-11 10:31:33 +08:00
Sam Hemelryk
7a6ef4ee8f
Merge branch 'w49_MDL-37060_m25_sessinit' of git://github.com/skodak/moodle
2012-12-11 15:27:26 +13:00
Sam Hemelryk
711e0ad9b7
Merge branch 'MDL-36942' of git://github.com/timhunt/moodle
2012-12-11 15:04:22 +13:00