8a3894de89
MDL-42427 backup: Fix undefined errors during automated backups
2013-10-23 12:10:14 +08:00
60ca7d5b07
MDL-41339 Tags - use uppercase for SQL keywords (AS)
2013-10-23 11:58:48 +08:00
697ecc6db1
Merge branch '24STABLE-wip-mdl-41339' of https://github.com/jennymgray/moodle into MOODLE_24_STABLE
2013-10-23 11:55:33 +08:00
e2536570a3
Merge branch 'w43_MDL-37813_m24_filterall' of https://github.com/skodak/moodle into MOODLE_24_STABLE
2013-10-23 10:18:47 +11:00
af90211efd
Merge branch 'MDL-42112-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-10-22 16:45:17 +08:00
1640389bcf
Merge branch 'MDL-29441-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
2013-10-22 13:21:27 +08:00
a70c9434d7
Merge branch 'MDL-26170_rss_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE
2013-10-22 15:04:25 +11:00
441b8d6e69
MDL-26170 RSS: fixed RSS cache clearing when items are deleted
2013-10-22 10:59:03 +07:00
de61d99ad1
MDL-31405 Assignment: removed type in time shift reset status
...
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
2013-10-22 11:54:23 +08:00
f311ba2714
Merge branch 'MDL-24380-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE
2013-10-22 14:35:09 +11:00
06032cd928
Merge branch 'MDL-42239-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE
2013-10-22 14:09:05 +11:00
d05a5b126c
MDL-42239 calendar: Fix missing ids issue with mouseover panels
2013-10-22 10:46:02 +08:00
45e4351ade
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully (it only concerns the alternative chat methods)
2013-10-22 10:45:27 +08:00
2811b3d262
Merge branch 'MDL-42201_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-10-22 10:30:43 +08:00
a122d95343
Merge branch 'MDL-34209-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
2013-10-21 13:58:40 +08:00
a10d621fc5
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
2013-10-21 16:51:33 +11:00
a322a0ab53
Merge branch 'w43_MDL-42386_m24_etag' of https://github.com/skodak/moodle into MOODLE_24_STABLE
2013-10-21 16:00:53 +11:00
36cfbfe841
MDL-42201 backup: introduced new automatic backup state
2013-10-21 11:49:07 +08:00
314cc22a28
MDL-34209 JavaScript: Simplify section drag/drop to fix reordering issues
2013-10-21 11:42:43 +08:00
bd1fae5fc0
Merge branch 'MDL-26244_url_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE
2013-10-21 11:25:27 +08:00
6e72e0a6aa
MDL-31405 assign: avoid uncessary get_string call
2013-10-21 11:02:45 +08:00
57bafe6ebc
Merge branch 'wip-mdl-31405-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
2013-10-21 10:59:00 +08:00
675fa4b813
MDL-37813 remove missing filters when configuring string filters and fix filter uninstall
2013-10-18 15:59:22 +02:00
58c57f94d6
MDL-42386 fix invalid etag comparison
...
Credit goes to Eloy Lafuente, thanks!
2013-10-18 14:49:49 +02:00
b6ced2f7e4
weekly release 2.4.6+
2013-10-18 16:16:43 +08:00
6123c76bc7
Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE
2013-10-18 16:16:34 +08:00
90b46f39a4
Merge branch 'MDL-41554-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE
2013-10-18 13:27:19 +08:00
1f3a85aa54
MDL-41554 rss: Move to more robust test url
...
tinyurl was sometimes failing (was bad to use them anyway)
2013-10-18 12:47:44 +08:00
98e4f24ff6
Merge branch 'MDL-42421_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-10-18 12:15:43 +08:00
48763c4d21
MDL-42112 tablelib: Generate the correct number of cols for empty rows
...
(And a test for it).
2013-10-18 11:56:06 +08:00
d91225aae4
MDL-42112 Tablelib: Add unit tests (some)
2013-10-18 11:56:03 +08:00
a5436ae8ce
MDL-42421 auth: removed incorrect statement in upgrade.txt
2013-10-18 11:38:56 +08:00
7a9000b1ff
MDL-41339 Tags: Added unique tag instance id to tag_get_tags functions
...
Avoids php warnings on creating new tags
2013-10-17 14:03:30 +01:00
85d47590cc
Merge branch 'MDL-42065_24' of https://github.com/sam-moodle/moodle into MOODLE_24_STABLE
2013-10-16 15:48:19 +08:00
8789750cc5
Merge branch 'MDL-37528-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
2013-10-16 11:16:45 +08:00
b15478526a
MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability
2013-10-16 08:33:39 +07:00
8786deb033
MDL-37877 backup: fix incorrect backported code.
2013-10-16 00:32:00 +02:00
e81aa9e8e6
Merge branch 'MDL-37877-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE
2013-10-15 16:58:39 +08:00
8a2e491ee7
Merge branch 'MDL-42209_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
2013-10-15 14:43:21 +08:00
3a6857090e
MDL-37877 backup: Fix issues with zipping of large files
...
Files bigger than 4GB is not supported at this point. Zip archiver doesn't know about it and always returns true. We need to verify if it is a valid file or not and delete if not
Also delete the backup file immediately if anything goes wrong anywhere in backup. We don't want to use up space
2013-10-15 13:18:46 +08:00
d2ff78d173
Merge branch 'wip-MDL-42234-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE
2013-10-15 14:11:58 +11:00
ef37c13e29
MDL-42309 typo: fix reponse -> response throughout Moodle.
2013-10-15 13:50:05 +11:00
a8d816982a
MDL-42234 - Repositories: Fix undefined variable notice when no repositories are enabled.
2013-10-15 10:47:22 +08:00
ac7f6f4b96
Merge branch 'w42_MDL-42082_m24_authdbpass' of https://github.com/skodak/moodle into MOODLE_24_STABLE
2013-10-14 14:36:29 +08:00
6da08c0e2c
MDL-42209 backup: fixed wrong icon being displayed when restoring course
2013-10-14 14:33:19 +08:00
f72e3fbbf2
MDL-34586 assignment - fix whitespace
2013-10-14 14:29:22 +08:00
8afe4de645
Merge branch 'MDL-34586-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE
2013-10-14 14:29:14 +08:00
1fc88334a6
Merge branch 'MDL-42232_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-10-14 14:24:17 +08:00
7643bd4ca9
Merge branch 'MDL-34612-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE
2013-10-14 14:12:23 +08:00
1b9f0beaf3
Merge branch 'MDL-41170-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE
2013-10-14 14:04:18 +08:00
Ankit Agarwal