Jason Fowler
d4f5439de2
MDL-35056 - Backup/Restore - Converting the 'Unmet Dependencies' Message to be a Developer Debug message to make moodle less confusing to the average user
2012-12-13 11:11:29 +08:00
Damyon Wiese
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
Dan Poltawski
137d63fe96
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-13 09:55:07 +08:00
sam marshall
c520e08653
MDL-37078: Restore - section restore fails with multiple availability conditions
2012-12-12 12:19:59 +00:00
Davo Smith
4615b7b6ff
MDL-37014 repository_webdav - strip the server URL from file & folder paths returned by webdav lib (if present)
2012-12-12 08:46:59 +00:00
Tim Hunt
d8a7ef0e42
MDL-36897 quiz review: fixup previous commit.
2012-12-12 08:13:43 +00:00
Frederic Massart
03f8841d9b
MDL-32639 files: Zipping a folder does not overwrite existing files
2012-12-12 14:41:08 +08:00
Frederic Massart
aa4d973436
MDL-32639 files: Improved File Manager download and zip support
...
Conflicts:
lib/filestorage/zip_packer.php
2012-12-12 14:41:04 +08:00
Mark Nelson
f2f5a5fc0e
MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x
2012-12-12 13:07:03 +08:00
Dan Poltawski
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
Cathal O'Riordan
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
Dan Poltawski
8869233e26
Merge branch 'm23_MDL-35737' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2012-12-12 08:44:13 +08:00
AMOS bot
bdefe732c5
Automatically generated installer lang files
2012-12-12 00:41:20 +00:00
Sam Hemelryk
3ad9a3fda3
Merge branch 'MDL-27619_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2012-12-12 11:09:32 +13:00
Eloy Lafuente (stronk7)
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
Sam Hemelryk
27f4a337a0
MDL-29805 redirect: added check REQUIRE_CORRECT_ACCESS is true
2012-12-12 09:47:00 +13:00
Sam Hemelryk
1b39edd662
Merge branch 'MDL-29805-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-12-12 09:45:03 +13:00
Sam Hemelryk
09fc0fde35
Merge branch 'MDL-35593-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
2012-12-12 09:38:27 +13:00
Sam Hemelryk
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
Sam Hemelryk
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
Eloy Lafuente (stronk7)
ecdee4a925
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 19:58:19 +01:00
Dan Poltawski
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
Dan Poltawski
7350e439bf
Merge branch 'MDL-36243_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
2012-12-11 16:24:34 +08:00
Dan Poltawski
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
Damyon Wiese
c8aa33ea2c
MDL-35740 Assignment: Show students the status of own submission on overview page.
...
This is a minimal patch just for backporting to 23.
2012-12-11 16:01:23 +08:00
Jason Fowler
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
Damyon Wiese
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
Dan Poltawski
f2190bac6c
Merge branch 'MDL-36712-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 14:01:14 +08:00
Dan Poltawski
1ff0a314c9
Merge branch 'MDL-36591-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 13:57:11 +08:00
Dan Poltawski
556f228a9e
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 13:54:23 +08:00
Dan Poltawski
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
Dan Poltawski
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
Dan Poltawski
1c570f9096
Merge branch 'MDL-36808-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2012-12-11 12:19:46 +08:00
Petr Škoda
1d2b58b5dd
MDL-36983 fix incorrect test method name
...
Credit goes to David Scotson, thanks.
2012-12-11 12:10:43 +08:00
Dan Poltawski
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
Dan Poltawski
957dfed5f2
Merge branch 'MDL-36845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 11:58:54 +08:00
Aparup Banerjee
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
Dan Poltawski
f95ba651fc
Merge branch 'MDL-36828_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
2012-12-11 11:44:40 +08:00
Dan Poltawski
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
Dan Poltawski
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
Jason Fowler
2874baa411
MDL-35884 - Course - Fixing bad whitespace/character return
2012-12-11 11:12:17 +08:00
Jason Fowler
4885064053
MDL-35884 - Course - Remove text from ALT attribute for activity chooser
2012-12-11 11:11:49 +08:00
Sam Hemelryk
39a36d7d7b
Merge branch 'MDL-36650_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 16:11:08 +13:00
Dan Poltawski
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
Sam Hemelryk
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
Sam Hemelryk
237ea8768c
Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-12-11 15:44:32 +13:00
Dan Poltawski
b2fa6cfa93
Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-11 10:39:42 +08:00
Dan Poltawski
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
Sam Hemelryk
2e6538382a
Merge branch 'MDL-36942_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 15:04:17 +13:00
Sam Hemelryk
b74804c8a8
Merge branch 'MDL-36954_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-12-11 14:59:50 +13:00