bc11a70203
Merge branch 'MDL-37939-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE
...
Conflicts:
lib/db/upgrade.php
version.php
2013-02-18 12:47:32 +08:00
a2f6f882c4
Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
...
Conflicts:
lib/db/upgrade.php
version.php
2013-02-18 11:33:00 +08:00
a2b5f389de
MDL-37683 cache: siteidentifier is now included in the keys
...
Conflicts:
lib/db/upgrade.php
lib/moodlelib.php
version.php
2013-02-18 08:30:29 +13:00
41d397e68b
MDL-37939 Course: Correct broken sequence data
2013-02-15 21:10:13 +00:00
09de5eb3de
weekly release 2.4.1+
2013-02-14 14:08:04 +08:00
3da2415167
MDL-36297 Version bump for js changes.
2013-02-12 09:40:11 +08:00
bac188fa71
MDL-35622 files: Add support for SMART Notebook MIME types
...
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945
Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com >
Fixed by: Paul Holden <pholden@greenhead.ac.uk >
Conflicts:
lib/db/upgrade.php
version.php
2013-02-11 10:29:50 +08:00
0e6d8bc952
weekly release 2.4.1+
2013-02-08 11:19:06 +08:00
a8e927e26c
weekly release 2.4.1+
2013-01-31 11:04:58 +01:00
9c0349b416
weekly release 2.4.1+
2013-01-25 15:58:09 +08:00
7700ec42c1
Merge branch 'MDL-34435-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
...
Conflicts:
version.php
2013-01-23 11:08:14 +13:00
7def53379b
weekly release 2.4.1+
2013-01-18 14:30:35 +08:00
00dba5bb11
MDL-36297 - increment version number
2013-01-14 15:05:56 +08:00
3e90b10ad8
Moodle release 2.4.1
2013-01-11 22:23:29 +01:00
8a646b55f7
weekly release 2.4+
2013-01-11 12:33:57 +01:00
5a2c33b107
MDL-34435 reports: Log category actions
...
Conflicts:
version.php
2013-01-10 15:14:38 +08:00
d63a406b02
weekly release 2.4+
2012-12-30 01:06:09 +01:00
322af447f5
weekly release 2.4+
2012-12-20 21:12:50 +01:00
b768c6f77a
MDL-36597 strip '_utf8' from all course.lang fields
2012-12-15 11:16:12 +01:00
4c7e6ea021
weekly release 2.4+
2012-12-14 13:31:08 +01:00
0b7c52dd4c
weekly release 2.4+
2012-12-08 02:56:23 +01:00
113105bf9c
MDL-36840 Set course.format to 'site' for site-course
2012-12-05 10:28:12 +08:00
f588fdfcc7
Moodle release 2.4
2012-12-03 20:01:33 +01:00
47dfbd9eb3
on-demand release 2.4rc1
2012-11-30 13:26:57 +01:00
08c05956e0
MDL-36933 Prepare main version and backup branch
2012-11-30 03:15:31 +01:00
fd6ab92b1d
Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle
...
Conflicts:
version.php
2012-11-28 10:57:09 +13:00
3546b9f4d2
version bump for lots of theme changes
2012-11-27 13:53:15 +08:00
f42c34a38a
On demand release 2.4beta+
2012-11-23 16:07:34 +08:00
eb48b61abb
On demand release 2.4beta+
2012-11-23 15:21:00 +08:00
9cae08dac4
MDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!)
2012-11-21 10:49:44 +08:00
0b37fe466a
MDL-36682 remove old unused shared memory caching support
2012-11-18 14:46:31 +01:00
2d7c5eeeea
on demand release 2.4beta+
2012-11-16 16:27:08 +08:00
7d1f162a36
on demand release 2.4beta+
2012-11-16 16:22:30 +08:00
9b835f70b6
MDL-36612 upgrade: Force courses cache to be rebuilt
2012-11-15 14:51:28 +08:00
7d2705568e
MDL-30643 added tables to upgrade script
2012-11-12 15:50:19 +08:00
8ccaa296fa
Moodle release 2.4beta
2012-11-09 18:49:38 +08:00
ae8e5057f4
weekly release 2.4dev
2012-11-09 17:56:42 +08:00
a56dc90320
Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2012-11-08 18:10:26 +08:00
3774324174
MDL-33791 Portfolio: Fixed security issue with passing file paths.
2012-11-08 00:26:13 +01:00
75af47ee1e
MDL-36386 cache: upgrades now trigger definitions to be updated
2012-11-07 10:42:20 +13:00
68acd1157e
MDL-33766 files: Improved validation of areamaxbytes
2012-11-01 16:47:06 +08:00
6109f2112c
weekly release 2.4dev
2012-11-01 14:52:00 +08:00
4e90ac1598
weekly release 2.4dev
2012-11-01 14:15:24 +08:00
11e766020b
MDL-35997 Create web service functions to return lang strings
2012-10-31 14:21:56 +08:00
d618dcf3c9
MDL-16660 - upgrade: split steps up into two
...
Be extra safe for potential debugging purposes
2012-10-30 14:33:30 +08:00
0c918a1f52
Merge branch 'wip-MDL-16660-m24' of git://github.com/samhemelryk/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-10-30 14:18:13 +08:00
b5a52acd9d
MDL-16660: Add calendar import.
...
Adds an extra import section alongside the existing export in the
calendar views. Allows the user to import from either a file or a
URL as a subscription, with an optional polling interval of hourly,
daily, weekly, monthly, or annually. This subscription may be added
to the user, group, global or course calendars. These subscriptions
are tracked in a separate database table, and an extra column added
to the events table to relate them to the subscription. The event
uuid field is also expanded to allow for the RFC-2445 UID property.
Subscriptions are listed on the calendar view page, and can be
added and removed, manually polled, and the polling interval
adjusted. Subscription events are updated on cron.
2012-10-30 17:33:18 +13:00
c28717d913
MDL-35116 - update version numbers
2012-10-29 14:08:28 +08:00
e93256ecf6
MDL-34399 - bump version to reload cache definition
2012-10-29 12:36:22 +08:00
7e8ae12a7a
weekly release 2.4dev
2012-10-18 19:41:39 +08:00
Damyon Wiese