Commit Graph

592 Commits

Author SHA1 Message Date
Ankit Agarwal d05a5b126c MDL-42239 calendar: Fix missing ids issue with mouseover panels 2013-10-22 10:46:02 +08:00
Eloy Lafuente (stronk7) 4ae75c1847 Merge branch 'w40_MDL-41999_m24_userpw' of https://github.com/skodak/moodle into MOODLE_24_STABLE 2013-10-01 15:59:24 +02:00
Petr Škoda cf55843d07 MDL-41999 do not use $USER->password directly 2013-09-27 10:55:12 +02:00
Mark Nelson 63b66cf276 MDL-41995 calendar: moved the location the page layout was set for the export page
This was done so that the blocks are shown when logged in and viewing this page.
2013-09-26 17:04:30 +08:00
Ankit Agarwal 2bcfd98eab MDL-41485 calendar: Replace value of action buttons on managesubscription page with int 2013-08-30 17:24:34 +08:00
Dan Poltawski 9ec19c21d2 MDL-41157 calendar: add unit tests for calendar_get_course_cached 2013-08-14 11:06:20 +08:00
Rajesh Taneja a608b0e670 MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit
Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
2013-03-04 01:51:09 +01:00
Frederic Massart d987453bd4 MDL-25853 calendar: Fixed broken previous/next links 2013-01-30 09:03:22 +08:00
Rajesh Taneja a19a913d7d MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription 2013-01-21 10:48:30 +08:00
Rajesh Taneja 76657ed83c MDL-37432 Calendar: Added check for empty calendar url 2013-01-21 10:48:30 +08:00
Ankit Agarwal 56f4d0ed80 MDL-37106 calendar: Proper capability checks should be done before processing an ical request 2013-01-08 14:02:54 +08:00
Ankit Agarwal 6c806e8384 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:58:21 +08:00
Ankit Agarwal 5b6e74c85f MDL-36738 calendar: Ical subscription list should display type of event 2013-01-08 13:58:21 +08:00
Sam Hemelryk c6e0d385c3 MDL-36341 calendar: fixed JS bug with popup node setter 2012-12-06 02:25:14 +01: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
Dan Poltawski ac9f5e3fc7 Merge branch 'wip-MDL-32180-master' of git://github.com/phalacee/moodle 2012-09-25 14:27:39 +08:00