moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57187 commits 37 branches 544 tags 1.3 GiB
Commit graph

14499 commits

Author SHA1 Message Date
Dan Poltawski
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
Sam Hemelryk
81b5ff0e8e Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle 2012-10-30 17:37:06 +13:00
Sam Hemelryk
e30390a0dd MDL-16660 calendar: Cleaned u several areas of the iCal patch in preparation of the next peer-review 
* Added a bit of AMOS to copy existing strings and save a little translation effort
* Cleaned up fixed strings in several places
* Cleaned up some existing strings as required.
* Fixed install and upgrade code. Split upgrade into two parts (one for each table).
* Fixed fatal error caused by missing forms lib inclusion
* Added param types to forms.
* Converted file_get_content to use curl for URL's.
* Cleaned things up per coding style.
* Separated subscription management and form into separate files.
* Tidied up bennu inclusion to just where required.
* Lots of other small fixes as well.

AMOS BEGIN
  CPY [calendar,calendar],[colcalendar,calendar]
  CPY [actions,moodle],[actions,calendar]
  CPY [never,moodle],[never,calendar]
AMOS END
 2012-10-30 17:33:49 +13:00
Jonathan Harker
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
Dan Poltawski
8586777168 Merge branch 'MDL-36015_m1' of git://git.catalyst.net.nz/moodle-r2 2012-10-30 10:18:45 +08:00
Sam Hemelryk
21d31a23a0 Merge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle 2012-10-30 13:31:30 +13:00
Sam Hemelryk
ebaa74a3e0 Merge branch 'MDL-36103' of git://github.com/timhunt/moodle 2012-10-30 12:52:00 +13:00
Dan Poltawski
01412583bf Merge branch 'master_MDL-35215' of git://github.com/totara/moodle 2012-10-29 15:33:43 +08:00
Dan Poltawski
4de9b85c83 Merge branch 'wip-MDL-36075_MASTER' of git://github.com/jason-platts/moodle 2012-10-29 14:57:14 +08:00
Dan Poltawski
02309e2d50 Merge branch 'MDL-34354-master' of git://git.luns.net.uk/moodle 2012-10-29 14:53:43 +08:00
Dan Poltawski
737492f1a5 Merge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle 2012-10-29 14:50:23 +08:00
Dan Poltawski
c28717d913 MDL-35116 - update version numbers 2012-10-29 14:08:28 +08:00
Frederic Massart
d8271e3908 MDL-35116 upgrade: Rename backup files having used short name previously 2012-10-29 14:07:18 +08:00
Dan Poltawski
890988221c Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle 2012-10-29 14:03:57 +08:00
Dan Poltawski
06b33f67b0 Merge branch 'w43_MDL-35843_m42_expiryself' of git://github.com/skodak/moodle 2012-10-29 13:49:47 +08:00
Dan Poltawski
b01783f086 Merge branch 'MDL-35964' of git://github.com/timhunt/moodle 2012-10-29 13:48:44 +08:00
Dan Poltawski
08f24a6686 Merge branch 'wip-MDL-34343-m24' of git://github.com/samhemelryk/moodle 2012-10-29 12:39:06 +08:00
Dan Poltawski
3aa721e035 Merge branch 'MDL-34399' of git://github.com/timhunt/moodle 2012-10-29 12:18:01 +08:00
Dan Poltawski
0e0ad4c9f9 Merge branch 'wip-MDL-36052-m24' of git://github.com/samhemelryk/moodle 2012-10-29 11:52:25 +08:00
Tim Hunt
a560d636f4 MDL-34399 questions: cache to help load question definitions. 
At the moment, it takes several DB queries to load each question definition,
so this cache is potentially a big win.
 2012-10-26 11:58:02 +08:00
Andrew Robert Nicols
afe3566cca MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events 2012-10-26 08:52:23 +08:00
Petr Škoda
9854743221 MDL-36199 reset plugin manager singletons 2012-10-25 00:55:10 +08:00
Petr Škoda
e169d3a818 MDL-34915 use SimpleYUI 
The main reason is to simplify theme development, the global Y should not be ideally used elsewhere.
 2012-10-24 22:18:23 +08:00
Petr Škoda
6df2abcf1a MDL-36145 import latest YUI 3.7.3 2012-10-20 15:22:15 +08:00
Tim Hunt
4726ad4fa4 MDL-36103 tablelib: links to user profiles are wrong in courses. 2012-10-19 16:49:34 +08:00
Petr Škoda
8c04252cbf MDL-35843 refactor expiry notifications to core enrol feature 2012-10-19 16:03:48 +08:00
Sam Hemelryk
4075433bfd MDL-36052 cache: Fixed up the cache README file. 2012-10-19 10:04:31 +08:00
Sam Hemelryk
9381983e5b MDL-25290 conversion: Added db column cache to pgsql + mysql 2012-10-19 08:08:59 +08:00
Sam Hemelryk
d90bbe6fce MDL-25290 conversion: Converted string cache to MUC 2012-10-19 08:08:50 +08:00
Frederic Massart
e462f46b77 MDL-35117 librairies: File Packer can only extract a specific list a files 2012-10-18 13:38:48 +08:00
Andrew Robert Nicols
09f200aa62 MDL-36099 AJAX Ensure that a galleryversion is always set for yui_module calls 2012-10-17 10:14:56 +01:00
Jason Platts
8f38558b7a MDL-36075 Forms: Date selector in forms errors in IE7 2012-10-16 12:06:03 +01:00
Sam Hemelryk
a896bc32cd Merge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle 2012-10-16 17:41:49 +08:00
Frederic Massart
a8397303d2 MDL-35412 phpunit: date_format_string() is case insensitive 2012-10-16 17:21:11 +08:00
Dan Poltawski
99da334454 Merge branch 'MDL-34228-master' of git://github.com/sammarshallou/moodle 2012-10-16 16:19:25 +08:00
Dan Poltawski
ac088b1c21 Merge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle 2012-10-16 14:50:30 +08:00
Dan Poltawski
ea0a092e99 Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle 2012-10-16 14:35:28 +08:00
Dan Poltawski
9b0a3e17ba Merge branch 'wip-MDL-35769-master' of git://github.com/marinaglancy/moodle 2012-10-16 13:41:17 +08:00
Sam Hemelryk
f7de90a74a MDL-33857 fixed up whitespace 2012-10-16 13:32:34 +08:00
Sam Hemelryk
2bbf03ce3b Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle 2012-10-16 13:31:44 +08:00
Frederic Massart
c5f2d11969 MDL-35412 core: Moving get_string out of if statement 2012-10-16 11:50:25 +08:00
Sam Hemelryk
8422094d91 Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle 2012-10-16 11:23:24 +08:00
Aparup Banerjee
2872bd5101 Merge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle 2012-10-16 11:08:01 +08:00
Dan Poltawski
43c7341b82 Merge branch 'wip-MDL-32184-master' of http://github.com/phalacee/moodle 2012-10-16 10:48:23 +08:00
Aparup Banerjee
cb6b5fb625 Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2012-10-16 10:46:11 +08:00
Dan Poltawski
dab6b11914 Merge branch 'w42_MDL-35955_m24_geckospell' of git://github.com/skodak/moodle 2012-10-16 09:57:30 +08:00
Dan Poltawski
f186ad1f90 Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle 2012-10-15 17:19:44 +08:00
Marina Glancy
44aa854e93 MDL-35339 coding style corrections 2012-10-15 16:57:25 +08:00
Mark Nielsen
eaf52ff01d MDL-33621 rating: fixed view help error for global scale rating 2012-10-15 16:54:43 +08:00
Dan Poltawski
348be850c9 Merge branch 'w42_MDL-35854_m24_usergenerator' of git://github.com/skodak/moodle 2012-10-15 16:03:53 +08:00