mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
59,348 Commits 36 Branches 527 Tags
Commit Graph

1592 Commits

Author SHA1 Message Date
Damyon Wiese
be1ef2f35d MDL-37792 Course - Fix upgrade step and set version number for completion field fix. 2013-02-26 10:49:46 +08:00
Damyon Wiese
b672408a1a Merge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle 2013-02-26 10:45:21 +08:00
Eloy Lafuente (stronk7)
05fc7ccc82 Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle 
Conflicts:
	course/tests/externallib_test.php
 2013-02-25 23:38:20 +01:00
sam marshall
6fea7a5f02 MDL-37792 Conditions: Interests condition offered but not implemented 2013-02-25 13:19:56 +00:00
Jason Fowler
34348b2b43 MDL-30072 - Notes, Webservices - adding Webservices for notes 2013-02-22 13:58:11 +08:00
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
Damyon Wiese
ebb1385c39 Merge branch 'MDL-29938-master' of git://github.com/mouneyrac/moodle 2013-02-19 10:10:48 +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
219faacc33 MDL-35622 - fix crazy character causing upgrade problems 
Can you see it?!
 2013-02-18 11:55:29 +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
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
Jerome Mouneyrac
b0365ea5d1 MDL-29938 get_users - search users external function 2013-02-11 13:57:59 +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
Mark Nelson
79949c1ba3 MDL-30098 core_course: adding webservice functions to allow the deletion of module instances 2013-02-06 16:56:17 +08:00
Damyon Wiese
33d943500f Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle 2013-02-05 15:53:21 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Dan Poltawski
ba076613d3 Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle 2013-02-05 10:47:15 +08:00
Petr Škoda
7a18f49c60 MDL-37726 remove PREVIOUS/NEXT from all install.xml files 
YAY!
 2013-01-29 22:34:46 +01:00
Eloy Lafuente (stronk7)
0ed03cc295 Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/tests/externallib_tests.php
 2013-01-29 15:19:11 +01:00
Sam Hemelryk
34e41c81f8 Merge branch 'MDL-37673-muc-groupdata-typo' of git://github.com/mudrd8mz/moodle 2013-01-28 17:49:24 +13:00
David Mudrák
34424d4c8b MDL-37673 Fix core_groupdata cache definition 2013-01-24 22:52:10 +01: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
Sam Hemelryk
9d98cb9f17 Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle 2013-01-23 09:54:36 +13:00
Sam Hemelryk
59573bb447 MDL-36621 calendar: fixed up conflict error 2013-01-22 16:35:48 +13: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
Ankit Agarwal
c66dc3dff5 MDL-37101 webservices: Define ws api core_calendar_create_calendar_events 2013-01-21 11:53:33 +08:00
Ankit Agarwal
793d38552a MDL-37100 webservices: Define core_calendar_get_calendar_events() api 2013-01-21 11:05:50 +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
Sam Hemelryk
e17dbeeb1a MDL-34398 groups: implemented caching of group information. 2013-01-17 09:24:58 +13:00
Eloy Lafuente (stronk7)
a91350609e Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/db/caches.php
 2013-01-16 01:08:26 +01:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8 MDL-30070 message: Web Services for contact list 2013-01-15 16:04:00 +08:00
Dan Poltawski
85533e2a03 Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle 2013-01-15 13:54:40 +08:00
Ankit Agarwal
5e1350abaa MDL-37077 webservices: Define the ws api method for deleting calendar events 2013-01-15 13:23:13 +08:00
Erik Lundberg
af7e05d6cc MDL-34436 - Blogs - Adding event triggers when adding a new entry, editing an entry or remove an entry. 2013-01-15 11:29:12 +08:00
Dan Poltawski
ddaf0983b2 Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle 2013-01-14 15:05:15 +08:00
Frederic Massart
95d1d0373b MDL-34435 reports: Log category actions 2013-01-10 15:10:22 +08:00
Sam Hemelryk
3913743aa3 Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle 2013-01-09 10:20:46 +13:00
Sam Hemelryk
007bfe8b4d MDL-25290 conversion: Converted config to use MUC 2013-01-07 19:22:40 +13:00
Sam Hemelryk
e85c56ccb8 MDL-36297 caching: added for HTML purified text 2013-01-03 10:55:00 +13:00
Petr Škoda
0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Dan Poltawski
62347c883b Merge branch 'w50_MDL-36493_m25_mysql' of git://github.com/skodak/moodle 2012-12-17 15:28:39 +08:00
Petr Škoda
57160c25d7 MDL-36493 improve timeout handling in mysql upgrade 
Credit goes to Mark Nielsen, thanks.
 2012-12-15 11:43:52 +01:00
Petr Škoda
801ae0f4d8 MDL-36493 improve performance of mysql unsigned/lob upgrade 2012-12-15 11:43:52 +01:00
Petr Škoda
dbfe415028 MDL-36597 strip '_utf8' from all course.lang fields 2012-12-15 11:13:10 +01:00