mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-12 11:32:04 +01:00
Code Issues Projects Releases Wiki Activity
59,246 Commits 36 Branches 523 Tags
Commit Graph

2248 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
345768b9b8 Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-19 12:57:10 +01:00
Dan Poltawski
d0231ac9a9 Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle 
Conflicts:
    version.php
    repository/googledocs/version.php
 2013-02-19 13:54:52 +08:00
Frederic Massart
3425813fc4 MDL-37217 repository: Google Docs repository uses Google SDK 2013-02-19 13:36:23 +08:00
Damyon Wiese
0c4ba06047 MDL-29938 Version bump for webservices. 2013-02-19 10:31:25 +08:00
Damyon Wiese
82a6332837 Merge branch 'MDL-37939-m' of https://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 13:35:36 +08:00
Dan Poltawski
28d72ad973 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-02-18 11:31:07 +08:00
Sam Hemelryk
e0d9b7c0d4 MDL-37683 cache: siteidentifier is now included in the keys 2013-02-18 08:32:03 +13:00
Andrew Robert Nicols
59a0ba3bdc MDL-37939 Course: Correct broken sequence data 2013-02-15 21:28:33 +00:00
Dan Poltawski
47570cc67d MDL-35750 - update to the ISO list of countries 
Netherlands Antilles has been split up as specified in ISO 3166-1
Newsletter VI-8 (2010-12-15). Users will need to choose their country.
http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf

PLEASE NOTE: if you are updating this list again, i've written a script
to automate it from now on, linked from the bug.
 2013-02-15 12:26:08 +08:00
Damyon Wiese
1dd6835d8c weekly release 2.5dev 2013-02-14 13:46:04 +08:00
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-02-12 10:09:26 +08:00
Damyon Wiese
87c9271514 MDL-37831: Version bump for js changes. 2013-02-12 09:34:02 +08:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
 2013-02-11 14:51:11 +08:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Dan Poltawski
06d8f380e9 MDL-35819 - version bump for various JS changes 2013-02-11 10:56:36 +08:00
Frederic Massart
58b1904fd1 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>
 2013-02-11 10:26:09 +08:00
Simon Coggins
ec2d8ceb88 MDL-35332 lib: Improve security of hashed passwords 2013-02-09 06:47:57 +13:00
Damyon Wiese
6319737865 weekly release 2.5dev 2013-02-08 11:13:54 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Eloy Lafuente (stronk7)
1918a2452e weekly release 2.5dev 2013-01-31 10:59:41 +01:00
Dan Poltawski
a737019604 weekly release 2.5dev 2013-01-25 15:57:30 +08:00
Aparup Banerjee
46112c0277 Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	version.php
 2013-01-23 14:57:45 +08:00
Sam Hemelryk
8c35fcdcd9 Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-01-23 11:08:55 +13:00
Ankit Agarwal
38c52ef291 MDL-37100 Version bump 2013-01-22 17:10:31 +08:00
Sam Hemelryk
36546841f1 Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/lib.php
	lib/db/caches.php
	version.php
 2013-01-22 16:35:03 +13:00
Dan Poltawski
a5ec499521 weekly release 2.5dev 2013-01-18 14:28:36 +08:00
Ankit Agarwal
e73b527c82 MDL-36621 calendar: cache calendar subscriptions and showicalsource setting 
Now MUC is used to cache subscription information when the constructor for an event is called, which is child of a ical subscription.
A new setting calendar_showicalsource is introduced which controls if the ical source should be displayed along with events in the calendar
Also minor changes has been done in places to make sure subscription id is always associated with ical events
 2013-01-17 13:40:06 +08:00
Eloy Lafuente (stronk7)
460ab53860 NOBUG: mini-bump to help cache definitions. 2013-01-16 15:57:46 +01:00
Dan Poltawski
2e55217173 MDL-36297 - increment version no 2013-01-14 15:06:20 +08:00
Eloy Lafuente (stronk7)
ca48fe5f97 NOBUG: Bumping version to test auto-packaging 2013-01-11 13:42:08 +01:00
Eloy Lafuente (stronk7)
2e5d013417 weekly release 2.5dev 2013-01-11 12:36:05 +01:00
Frederic Massart
95d1d0373b MDL-34435 reports: Log category actions 2013-01-10 15:10:22 +08:00
Sam Hemelryk
be5a3168df MDL-21342 auth: tidy up pre-integration 2013-01-08 13:41:22 +13:00
Petr Škoda
0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Eloy Lafuente (stronk7)
9da506c2a3 weekly on-sync release 2.5dev 2012-12-30 01:07:00 +01:00
Eloy Lafuente (stronk7)
0dc5a532ec weekly on-sync release 2.5dev 2012-12-20 21:13:26 +01:00
Dan Poltawski
a03b106cc2 MDL-36597 - bump version number 2012-12-17 13:52:22 +08:00
Eloy Lafuente (stronk7)
20751863e3 weekly on-sync release 2.5dev 2012-12-14 13:33:07 +01:00
Eloy Lafuente (stronk7)
4bd6f71bad weekly on-sync release 2.5dev 2012-12-08 02:58:07 +01:00
Marina Glancy
e28d5db2ee MDL-36840 Set course.format to 'site' for site-course 2012-12-05 10:31:24 +08:00
Eloy Lafuente (stronk7)
cf08763204 weekly release 2.5dev 2012-12-03 20:05:30 +01:00
Eloy Lafuente (stronk7)
f588fdfcc7 Moodle release 2.4 2012-12-03 20:01:33 +01:00
Eloy Lafuente (stronk7)
47dfbd9eb3 on-demand release 2.4rc1 2012-11-30 13:26:57 +01:00
Eloy Lafuente (stronk7)
08c05956e0 MDL-36933 Prepare main version and backup branch 2012-11-30 03:15:31 +01:00
Sam Hemelryk
fd6ab92b1d Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle 
Conflicts:
	version.php
 2012-11-28 10:57:09 +13:00
Dan Poltawski
3546b9f4d2 version bump for lots of theme changes 2012-11-27 13:53:15 +08:00
Dan Poltawski
f42c34a38a On demand release 2.4beta+ 2012-11-23 16:07:34 +08:00
Dan Poltawski
eb48b61abb On demand release 2.4beta+ 2012-11-23 15:21:00 +08:00
Aparup Banerjee
9cae08dac4 MDL-36614 fixed version upgrade conflict (git why you no tell me about conflict!) 2012-11-21 10:49:44 +08:00
Petr Škoda
0b37fe466a MDL-36682 remove old unused shared memory caching support 2012-11-18 14:46:31 +01:00