mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
58,727 Commits 36 Branches 519 Tags
Commit Graph

1565 Commits

Author SHA1 Message Date
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
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
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Marina Glancy
e28d5db2ee MDL-36840 Set course.format to 'site' for site-course 2012-12-05 10:31:24 +08:00
Dan Poltawski
bd80fcc357 Merge branch 'wip-MDL-36859-m24' of git://github.com/samhemelryk/moodle 2012-11-28 09:56:59 +08: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
Sam Hemelryk
73321216a1 MDL-36859 cache: removed unused config definition 2012-11-28 10:34:33 +13: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
Aparup Banerjee
6bf410ed4b Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle 
Conflicts:
	calendar/lib.php (MDL-36615)
	calendar/managesubscriptions_form.php (MDL-36352)
 2012-11-21 10:29:04 +08:00
Ankit Agarwal
20131e5cdd MDL-36614 calendar: upgrade code for adding eventtype field to all existing installs 2012-11-20 13:20:43 +08:00
Ankit Agarwal
7133a88d06 MDL-36614 calendar: Add event type field to the database 2012-11-19 13:14:57 +08:00
Petr Škoda
0b37fe466a MDL-36682 remove old unused shared memory caching support 2012-11-18 14:46:31 +01:00
Dan Poltawski
2a594e13b1 Merge branch 'MDL-36612-master-int' of git://github.com/FMCorz/moodle 2012-11-16 11:03:45 +08:00
Frederic Massart
9b835f70b6 MDL-36612 upgrade: Force courses cache to be rebuilt 2012-11-15 14:51:28 +08:00
Aparup Banerjee
244e907235 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle 
Conflicts:
	lib/tests/statslib_test.php
 2012-11-15 11:15:00 +08:00
Tyler Bannister
aa600c472c MDL-30643 - Added fifth table to speed up enrolment look ups. 2012-11-12 22:47:00 -05:00
Aparup Banerjee
7d2705568e MDL-30643 added tables to upgrade script 2012-11-12 15:50:19 +08:00
Tyler Bannister
63e0fe85b5 RFC-30643 - Added fifth table to speed up enrolment look ups. 2012-11-09 16:33:19 -05:00
Tyler Bannister
4614b02905 MDL-30643 - Added definition for new temporary table to install.xml. 
- Added code to generate tempoary tables from existing standard tables where possible.
 2012-11-09 16:27:23 -05:00
Dan Poltawski
ae8e5057f4 weekly release 2.4dev 2012-11-09 17:56:42 +08:00
Dan Poltawski
a56dc90320 Merge branch 'MDL-33766-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2012-11-08 18:10:26 +08:00
Mark Nelson
3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Sam Hemelryk
47834bcd41 MDL-36120 cache: now uses sha1 and has an option for simple keys 2012-11-07 10:03:32 +13:00
Dan Poltawski
2c36da50bc Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2012-11-06 10:03:23 +08:00
Sam Hemelryk
2e1e266c9a MDL-36362 cache: added simpledata definition option 2012-11-05 10:28:07 +13:00
Marina Glancy
b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options 
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
 2012-11-02 10:56:19 +08:00
Marina Glancy
29ac9fc1f8 MDL-35768 create table course_format_options, increase length of course.format field 2012-11-02 10:55:21 +08:00
Frederic Massart
380c122fe2 MDL-33766 files: Capability to ignore userquota 2012-11-01 16:46:42 +08:00