271bfb48b8
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 17:43:21 +08:00
6a1bcbfdab
MDL-36263 Assignment: Fix backport for counting submissions of unenrolled students
2012-12-13 17:41:17 +08:00
87e9ea1f67
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 10:32:38 +01:00
4d8125b1c7
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:59:04 +08:00
137d63fe96
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-13 09:55:07 +08:00
d8a7ef0e42
MDL-36897 quiz review: fixup previous commit.
2012-12-12 08:13:43 +00:00
9391d2f4cf
Merge branch 'wip-MDL-33448-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
2012-12-12 09:38:03 +08:00
18a0b829a4
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:57:21 +08:00
8869233e26
Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2012-12-12 08:44:13 +08:00
3ad9a3fda3
Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2012-12-12 11:09:32 +13:00
106c4841a7
Merge branch 'MDL-32880_23_3' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2012-12-11 22:50:08 +01:00
27f4a337a0
MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true
2012-12-12 09:47:00 +13:00
1b39edd662
Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-12-12 09:45:03 +13:00
09fc0fde35
Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-12-12 09:38:27 +13:00
6e89cdb35f
Merge branch 'wip_23_mdl-37088_bad_operator_ldap_sync_user' of https://github.com/iarenaza/moodle into MOODLE_23_STABLE
2012-12-12 09:34:31 +13:00
eb49335150
Merge branch 'MDL-36321_message_participants_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
2012-12-12 09:28:58 +13:00
ecdee4a925
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 19:58:19 +01:00
def1725853
Merge branch 'w49_MDL-36447_m23_gdtest' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 17:54:51 +08:00
7350e439bf
Merge branch 'MDL-36243_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-12-11 16:24:34 +08:00
eba170d8fc
Merge branch 'wip-MDL-36108-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-12-11 16:03:41 +08:00
a5dbb601ce
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:27 +08:00
0887f75587
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:41:56 +08:00
f2190bac6c
Merge branch 'MDL-36712-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 14:01:14 +08:00
1ff0a314c9
Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 13:57:11 +08:00
556f228a9e
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 13:54:23 +08:00
a2f2dbb5dc
Merge branch 'w49_MDL-36685_m23_tablecells' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 13:44:01 +08:00
f55f2e48ca
Merge branch 'MDL-34791-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
2012-12-11 13:23:08 +08:00
1c570f9096
Merge branch 'MDL-36808-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2012-12-11 12:19:46 +08:00
1d2b58b5dd
MDL-36983 fix incorrect test method name
...
Credit goes to David Scotson, thanks.
2012-12-11 12:10:43 +08:00
a2577a7cc3
Merge branch 'w49_MDL-36892_m23_enrolreadme' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 12:07:22 +08:00
957dfed5f2
Merge branch 'MDL-36845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 11:58:54 +08:00
4e66b8908c
Merge branch 'w49_MDL-36817_m23_composer' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 11:54:53 +08:00
f95ba651fc
Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
2012-12-11 11:44:40 +08:00
10c8b7390c
Merge branch 'wip-MDL-36110-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-12-11 11:33:22 +08:00
5d1dff532e
Merge branch 'wip-MDL-35884-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-12-11 11:17:43 +08:00
2874baa411
MDL-35884 - Course - Fixing bad whitespace/character return
2012-12-11 11:12:17 +08:00
4885064053
MDL-35884 - Course - Remove text from ALT attribute for activity chooser
2012-12-11 11:11:49 +08:00
39a36d7d7b
Merge branch 'MDL-36650_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 16:11:08 +13:00
3f358a021b
Merge branch 'MDL-36025-negative-zero-MOODLE_23_STABLE' of git://github.com/mpetrowi/moodle into MOODLE_23_STABLE
2012-12-11 11:07:43 +08:00
b54470f497
Merge branch 'w49_MDL-36731_m23_uploadestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 16:04:13 +13:00
237ea8768c
Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-12-11 15:44:32 +13:00
b2fa6cfa93
Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:39:42 +08:00
8f647f1d3a
Merge branch 'w49_MDL-31424_m23_paypalcase' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-12-11 10:31:44 +08:00
2e6538382a
Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 15:04:17 +13:00
b74804c8a8
Merge branch 'MDL-36954_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 14:59:50 +13:00
14802ee558
Merge branch 'MDL-36773-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-12-11 09:56:47 +08:00
702ac0ce02
MDL-37061 always validate lang when setting session user
...
This should resolve problems with TinyMCE langs and some unknown MUCH caching issue.
2012-12-11 14:44:41 +13:00
72754427b6
MDL-36321 core_message: made the course participants list correctly show if course participants are contacts or not
2012-12-11 08:55:25 +08:00
f6ca5cf303
MDL-29442 add missing utf-8 to entity html encoding and decoding
2012-12-11 10:23:12 +13:00
3c805e592c
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:10:07 +13:00
Dan Poltawski