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
57,046 Commits 36 Branches 519 Tags
Commit Graph

57046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rajesh Taneja
7482a71401 MDL-34777 Accessibility: Add proper id to select input 2012-10-31 11:35:43 +08:00
Dan Poltawski
b89ec44032 Merge branch 'wip-mdl-29762' of git://github.com/rajeshtaneja/moodle 2012-10-31 10:50:44 +08:00
Aparup Banerjee
07e3b0f17d Merge branch 'MDL-31708-master' of git://github.com/StudiUM/moodle 2012-10-31 10:04:56 +08:00
Dan Poltawski
8120a4fa72 Merge branch 'wip-mdl-34777' of git://github.com/rajeshtaneja/moodle 2012-10-31 09:59:44 +08:00
Sam Hemelryk
eecddb8fd4 Merge branch 'MDL-31934_master' of git://github.com/lazydaisy/moodle 2012-10-31 10:15:44 +13:00
Mary Evans
d895d70f9e MDL-31934 mod/forum: Added CSS fix to mod/forum/styles.css for unread forumposts also reversed a previous commit in theme/base/core.css. 2012-10-30 11:34:02 +00:00
Dan Poltawski
639a2868c3 Merge branch 'MDL-34332c' of git://github.com/srynot4sale/moodle 2012-10-30 16:20:39 +08:00
Dan Poltawski
eedaf16e9e Merge branch 'MDL-35386b' of git://github.com/srynot4sale/moodle 2012-10-30 16:12:56 +08:00
Dan Poltawski
81bfb046af Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle 2012-10-30 16:05:43 +08:00
Dan Poltawski
24a3115caf MDL-16660 calendar - remove cron strings 
We don't translate cronjobs
 2012-10-30 15:27:02 +08:00
Dan Poltawski
c5a82120ac MDL-16660 calendar: remove get_ical_data() from form 
This code was only called in one path and so was not necessary.
 2012-10-30 14:56:39 +08:00
Dan Poltawski
d618dcf3c9 MDL-16660 - upgrade: split steps up into two 
Be extra safe for potential debugging purposes
 2012-10-30 14:33:30 +08:00
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
Dan Poltawski
d3cf8fdf5d Merge branch 'wip-MDL-36094-m24' of git://github.com/samhemelryk/moodle 2012-10-30 13:44:38 +08:00
Dan Poltawski
90d71805f4 Merge branch 'wip-MDL-32326-m24' of git://github.com/samhemelryk/moodle 2012-10-30 13:40:24 +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
4c349ad7ba MDL-16660: WIP - fixes as per review 2012-10-30 17:33:18 +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
709d684341 Merge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign 2012-10-30 12:14:40 +08:00
Dan Poltawski
ef96f58535 Merge branch 'wip-mdl-35489' of git://github.com/rajeshtaneja/moodle 2012-10-30 12:11:44 +08:00
Dan Poltawski
0caa0c869b Merge branch 'MDL-4655-master' of git://github.com/FMCorz/moodle 2012-10-30 11:58:34 +08:00
Sam Hemelryk
e118ad21c9 Merge branch 'MDL-34274-master' of git://github.com/ankitagarwal/moodle 2012-10-30 16:00:45 +13:00
Sam Hemelryk
c8757a3c87 Merge branch 'MDL-35889-master' of git://github.com/ankitagarwal/moodle 2012-10-30 15:48:54 +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
Dan Poltawski
752a3f14be Merge branch 'wip-mdl-35910' of git://github.com/rajeshtaneja/moodle 2012-10-30 10:00:11 +08:00
Dan Poltawski
e76cc8f4c0 Merge branch 'MDL-36135-evaluators' of git://github.com/mudrd8mz/moodle 2012-10-30 09:37:03 +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
a9ab988e43 Merge branch 'WIP-MDL-36070-master' of git://github.com/nadavkav/moodle 2012-10-30 13:02:24 +13:00
Sam Hemelryk
41b4e5ec7f Merge branch 'MDL-36076' of git://github.com/timhunt/moodle 2012-10-30 12:59:23 +13:00
Sam Hemelryk
ca55ce4b35 Merge branch 'MDL-36101-master' of git://github.com/micaherne/moodle 2012-10-30 12:54:56 +13:00
Sam Hemelryk
ebaa74a3e0 Merge branch 'MDL-36103' of git://github.com/timhunt/moodle 2012-10-30 12:52:00 +13:00
Sam Hemelryk
86c0eb48ba Merge branch 'MDL-36105-master' of https://github.com/mackensen/moodle 2012-10-30 12:31:22 +13:00
Sam Hemelryk
558aecf818 Merge branch 'wip-mdl-36131' of git://github.com/rajeshtaneja/moodle 2012-10-30 12:24:31 +13:00
Sam Hemelryk
7080f72c73 Merge branch 'MDL-36137_master' of git://github.com/lazydaisy/moodle 2012-10-30 12:17:11 +13:00
Dan Poltawski
8688c112b6 Merge branch 'MDL-34910_master' of git://github.com/dmonllao/moodle 2012-10-29 15:36:07 +08: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
69c9669a58 Merge branch 'MDL-34363' of git://github.com/merrill-oakland/moodle 2012-10-29 15:21:39 +08:00
David Monllao
4219ffab43 MDL-34910 blog Remove new entry link when the context doesn't allows to add new entries 2012-10-29 15:04:45 +08:00
Dan Poltawski
506263cfee Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle 2012-10-29 14:59:45 +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
09f2367617 MDL-34354 - remove unused line 2012-10-29 14:54: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
f6110392f1 Merge branch 'MDL-35880-master' of git://github.com/ankitagarwal/moodle 2012-10-29 14:35:21 +08:00
Dan Poltawski
aed58a3da8 Merge branch 'MDL-35990-master' of git://github.com/FMCorz/moodle 2012-10-29 14:32:11 +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
3dce356ac4 Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle 2012-10-29 13:55:06 +08:00