Dan Poltawski
f28b5664eb
Merge branch 'wip-MDL-35979-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
2012-12-17 11:48:47 +08:00
Dan Poltawski
bda079183e
Merge branch 'MDL-37078-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
2012-12-17 11:37:10 +08:00
Dan Poltawski
71c3eff427
Merge branch 'MDL-37165-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-17 11:30:35 +08:00
Sam Hemelryk
5f9106b7f2
MDL-25928 course: Fixed course info on the combo list to be a popup
2012-12-17 16:03:42 +13:00
Petr Škoda
a530b69dd5
MDL-37171 fix multiple spreadsheet related PHP4isms
2012-12-15 12:41:02 +01:00
Petr Škoda
91438d7894
MDL-36245 add tests for the buggy utf-8 to utf-8 conversion
2012-12-15 11:51:21 +01:00
Petr Škoda
f16a143872
MDL-36245 try to workaround buggy iconv() when converting text from utf-8 to utf-8
2012-12-15 11:51:21 +01:00
Petr Škoda
84b9192875
MDL-36493 improve timeout handling in mysql upgrade
...
Credit goes to Mark Nielsen, thanks.
2012-12-15 11:44:55 +01:00
Petr Škoda
4df8d1924d
MDL-36493 improve performance of mysql unsigned/lob upgrade
2012-12-15 11:44:55 +01:00
Petr Škoda
372bfa208c
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:24:56 +01:00
Petr Škoda
fb5d7df075
MDL-36597 strip '_utf8' from all course.lang fields
2012-12-15 11:18:59 +01:00
Joseph Rezeau
d057719e98
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:07:58 +00:00
Thanh Le
defbd5dd2c
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:07:40 +00:00
Tim Hunt
c49b83bccc
MDL-32245 question bank: fix coding style in categories.php
2012-12-15 10:07:09 +00:00
Thanh Le
99231022af
MDL-32245 question bank: fix moving categories between contexts.
2012-12-15 10:07:08 +00:00
AMOS bot
188c725387
Automatically generated installer lang files
2012-12-15 00:42:08 +00:00
Eloy Lafuente (stronk7)
cdfb784e52
MDL-37176 timezones: updated to 2012j
2012-12-14 20:08:45 +01:00
Eloy Lafuente (stronk7)
7d2c5cd0a0
weekly release 2.3.3+
2012-12-14 13:30:25 +01:00
Eloy Lafuente (stronk7)
4e6157ca5f
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
2012-12-14 13:20:49 +01:00
Frederic Massart
50cff3c0cb
MDL-36456 repository: S3 handles errors in a nicer way
2012-12-14 17:57:02 +08:00
Damyon Wiese
63fd639d85
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:16:06 +08:00
Dan Poltawski
271bfb48b8
Merge branch 'MDL-36263-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 17:43:21 +08:00
Damyon Wiese
6a1bcbfdab
MDL-36263 Assignment: Fix backport for counting submissions of unenrolled students
2012-12-13 17:41:17 +08:00
Eloy Lafuente (stronk7)
87e9ea1f67
Merge branch 'MDL-30700-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2012-12-13 10:32:38 +01:00
Jason Fowler
e98a1a118e
MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field
2012-12-13 15:10:18 +08:00
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