mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
63,747 Commits 36 Branches 519 Tags
Commit Graph

643 Commits

Author SHA1 Message Date
Ankit Agarwal
7c30224aeb MDL-37100 webservices: PHPunit tests for core_calendar_get_calendar_events() 2013-01-21 11:05:50 +08:00
Ankit Agarwal
475896bdbc MDL-37100 webservices: Implement core_calendar_get_calendar_events() 2013-01-21 11:05:50 +08:00
Rajesh Taneja
f40c37d005 MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription 2013-01-21 10:46:19 +08:00
Rajesh Taneja
378cb038b2 MDL-37432 Calendar: Added check for empty calendar url 2013-01-21 10:28:32 +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
Ankit Agarwal
07c03ff96a MDL-36621 calendar: Display subscription info in calendar event popups 2013-01-17 11:09:50 +08:00
Ankit Agarwal
8a7326ed4e MDL-36621 calendar: Ical event should display source info 2013-01-17 11:09:50 +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
644a7ef7a4 MDL-37077 phpunit: Adding phpunit tests for the ws api core_calendar_delete_event 2013-01-15 13:54:38 +08:00
Ankit Agarwal
01bea07d93 MDL-37077 webservices: Implementing the WS api core_calendar_delete_calendar_events() 2013-01-15 13:23:14 +08:00
Ankit Agarwal
af5d990b59 MDL-32341 calendar: calendar custom date range export 
Adding support to export calendar events for a custom date range based on admin settings
 2013-01-14 10:15:09 +08:00
Ankit Agarwal
7a216229ab MDL-37106 calendar: Proper capability checks should be done before processing an ical request 2013-01-08 14:03:38 +08:00
Ankit Agarwal
7af294352b MDL-36738 calendar: Display events imported details 
We should display a the status of events when a new subscription is added. Although this means we need to redirect through an itermediate page.
 2013-01-08 13:47:49 +08:00
Ankit Agarwal
8c84f374c0 MDL-36738 calendar: Ical subscription list should display type of event 2013-01-08 13:47:48 +08:00
Sam Hemelryk
cc52e16c4a MDL-36341 calendar: fixed JS bug with popup node setter 2012-12-03 11:31:34 +13:00
Sam Hemelryk
58014c5621 Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle 2012-11-28 11:25:24 +13:00
Aparup Banerjee
63e2347e1c Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle 2012-11-27 15:49:32 +08:00
Ankit Agarwal
c34e03097a MDL-36710 calendar: Correcting the validation checks 2012-11-27 15:33:36 +08:00
Dan Poltawski
e7705abdde Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-27 13:10:27 +08:00
Frederic Massart
857c5f90e7 MDL-36775 usability: Code update following new calendar icons 2012-11-23 14:45:29 +08:00
Barbara Ramiro
5326675e20 MDL-36775 usability: New icons for calendar events 2012-11-23 14:11:07 +08:00
Ankit Agarwal
cfb59253f6 MDL-36710 calendar: Implementing proper required rules for filepicker 2012-11-22 16:55:54 +08:00
Ankit Agarwal
17475a2094 MDL-36400 calendar: Allow only ics file type in ical import 2012-11-21 16:09:47 +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
Dan Poltawski
f132526512 Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle 2012-11-20 15:31:27 +08:00
Frederic Massart
f19d57e514 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:58:33 +08:00
Ankit Agarwal
35ad5fc6bb MDL-36614 calendar: Add support for storing the submitted event type 2012-11-20 13:20:42 +08:00
Sam Hemelryk
0d463df072 Merge branch 'wip-mdl-36352' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:55:12 +13:00
Sam Hemelryk
41d17e48c7 Merge branch 'wip-mdl-36351' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:51:13 +13:00
Ankit Agarwal
f5b20ea317 MDL-36615 calendar: The type of event should be named site not global for consistencies 2012-11-19 12:05:09 +08:00
Rajesh Taneja
39bd8a5c59 MDl-36352 Calendar: Moved poll interval next to url field for accessibility 2012-11-16 15:57:21 +08:00
Rajesh Taneja
3e2efe3b05 MDl-36352 Calendar: Poll interval will be disabled for calendar file import 2012-11-16 15:55:45 +08:00
Rajesh Taneja
4e3ce3464d MDL-36351 Calendar: Poll interval for existing subscriptions will update 
Pollinterval option value was not set, which was returning string, expected is int.
Added int as pollinterval option value.
 2012-11-16 15:44:00 +08:00
Dan Poltawski
c941aafebb Merge branch 'wip-MDL-36276-m24' of git://github.com/samhemelryk/moodle 2012-11-16 14:52:09 +08:00
Dan Poltawski
716bf54332 Merge branch 'MDL-36525-master' of git://github.com/ankitagarwal/moodle 2012-11-16 14:49:44 +08:00
Dan Poltawski
c936a6af35 MDL-36526 - calendar: trim urls for copy/pasting 2012-11-16 12:06:41 +08:00
Ankit Agarwal
20bdf99764 MDL-36525 calendar: Curl should allow urls with force downloads 2012-11-15 16:55:03 +08:00
Dan Poltawski
b34e88508b MDL-36526 calendar: Convert webcal:// to http:// 
Curl doesn't understand webcal, so needs to use http. Also fixed some
php warnings spotted during testing.
 2012-11-15 15:48:24 +08:00
Ankit Agarwal
12927e568b MDL-36526 calendar: calender ical import should allow webcal:// protocols 2012-11-14 10:22:28 +08:00
Sam Hemelryk
e60598730d MDL-36276 calendar: subscription events are no longer editable 2012-11-14 13:34:54 +13:00
Dan Poltawski
20272a548c Merge branch 'wip-mdl-36303' of git://github.com/rajeshtaneja/moodle 2012-11-07 11:57:58 +08:00
Aparup Banerjee
c770f07155 Merge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle 2012-11-05 10:27:57 +08:00
Rajesh Taneja
cfa4a78b75 MDL-36303 Calendar: remove html special chars from event link in calendar block 2012-11-02 15:02:27 +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
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
Jason Platts
462e42cb9a MDL-34530 Calendar: Can create event for any group, but cannot view it 2012-10-23 10:17:16 +01:00
Jason Fowler
9e142d1121 MDL-31824 - Calendar - Fixing HTML classes fopr calendar month view - patch provided by Mark Ward 2012-10-18 12:49:32 +08:00