696 Commits

Author SHA1 Message Date
Sam Hemelryk
13f60ffce1 Merge branch 'MDL-47474' of https://github.com/bostelm/moodle 2014-10-08 11:52:17 +13:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Henning Bostelmann
ed8adc7cf5 MDL-47474 Calendar export: Fix user id in authorization check 2014-09-30 19:39:29 +01:00
Dan Poltawski
d62f99195a Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-09-30 09:55:03 +01:00
Brian Barnes
11edf09c61 MDL-46127 core_calendar: Removed tables when rendering a single event 2014-09-29 10:45:39 +13:00
Stephen Bourget
accc3ced1a MDL-46084 Calendar: Fix importing of full day events from Google 2014-09-25 09:42:10 -04:00
Brian Barnes
1d3972adcc MDL-47186 calendar: Changed month name to h2 from h1 2014-09-10 15:34:15 +12:00
Brian Barnes
4a222f026a MDL-46716 core_calendar: Replaced iCal image with stylised text 2014-08-22 09:44:58 +12:00
Brian Barnes
712e5f222f MDL-46643 calendar: improved tab order of calendar detail pages 2014-08-01 11:53:02 +12:00
Eloy Lafuente (stronk7)
39b803cf56 Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle 2014-07-14 16:25:23 +02:00
Brian Barnes
186f2f47dd MDL-46197 core_calendar: Added label text to durations in minutes field 2014-07-11 09:11:20 +12:00
Jean-Philippe Gaudreau
b8ad1728d8 MDL-45765 Calendar import: Fix undefined variable in cron when updating calendar subscriptions 2014-07-10 16:09:28 -04:00
Dan Poltawski
abc5f84539 MDL-44605 calendar: improved returnurl validation
Now we will only redirect to a local url (though sesskey was
already preventing this redirect from being open)
2014-07-09 01:05:51 +02:00
Sam Hemelryk
bac04a65bb Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle 2014-07-08 13:10:30 +12:00
Frederic Massart
23a2d6f7c5 MDL-42393 calendar: Preventing open/close loop in events overlay 2014-07-01 11:20:33 +08:00
Brian Barnes
afeb71078b MDL-46144 core_calendar: Fixed linking of labels on calendar pages 2014-07-01 13:39:38 +12:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Daniel Neis Araujo
912af66e61 MDL-42869 calendar: HTML validation check fails on add event screen 2014-04-23 14:50:35 -03:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
sam marshall
8270f0d0bd MDL-44070 Conditional availability enhancements (9): wider changes
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
2014-04-07 20:11:59 +01:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
Ankit Agarwal
5ac3b20dc5 MDL-40915 events: Add unit tests for the newly created events 2014-03-21 16:33:19 +08:00
Ankit Agarwal
9cb5d05f2f MDL-40915 events: Replace add_to_log with events in calendar 2014-03-21 16:33:19 +08:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Ankit Agarwal
0f1e1313a5 MDL-42079 calendar: Update core apis to support ical imports with rrule repeats 2014-03-05 09:48:07 +08:00
Ankit Agarwal
693fced7f1 MDL-42079 calendar: Add unittests for rrule_manager class 2014-03-05 09:48:07 +08:00
Ankit Agarwal
76eef5b2eb MDL-42079 calendar: Add a rrule_manager class 2014-03-05 09:48:07 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
2014-02-27 18:22:05 +08:00
Sam Hemelryk
e5adc5a11c MDL-44105 calendar: fixed typo with @package 2014-02-16 12:14:33 +13:00
Sam Hemelryk
ba1ce6e9ad MLD-28567 calendar: improved course filter process 2014-02-10 08:31:47 +13:00
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage!
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
2014-01-08 14:51:06 +08:00
Andrew Nicols
2ad8f0f680 MDL-43532 Course: Remove deprecated functions from calendar
This function was deprecated in 2.4 and was due for removal in 2.6.

Removing as per deprecation policy.
2014-01-02 11:27:25 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Michael Milette
9984132c23 MDL-41257 calendar: Day and Upcoming-Events view not processed through text_filters() function
This fix adds text filtering to the Calendar Day view and Upcoming Events view, specifically the event name and event description.

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2013-11-19 08:33:04 -05:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
2013-11-06 16:40:01 +00:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Rajesh Taneja
d61d3e82d0 MDL-42537 calendar: locale charset on windows will come from calendartype
date_format_string() will now convert date on windows based on calendar type used
2013-11-04 15:54:19 +08:00
Mark Nelson
1d43da0220 MDL-41664 core_calendar: replaced class variables that stored minimum and maximum years with functions
Also made slight changes to the existing functions.
2013-10-30 12:42:12 +08:00
Adrian Greeve
73412d9680 MDL-41664 - Calendar: Add method for formating years in the new calendar plugin. 2013-10-30 11:53:16 +08:00
Ankit Agarwal
9c7f855b49 MDL-42239 calendar: Fix missing ids issue with mouseover panels 2013-10-22 10:39:32 +08:00
Mark Nelson
1032966cee MDL-41792 core_calendar: fixed issues when using multiple calendar types
1) No longer assume that the end of the current month in Gregorian will be
the end of the month for the calendar type being used.
2) Need to take into account the hours and minutes a calendar type may vary
in order to generate timestamps.
3) When generating the previous and next month links start at the beginning
of the month, not the current day.
4) Need to convert to Gregorian when creating timestamps during calendar
exports.
2013-10-11 16:28:04 +08:00
Petr Škoda
ed661154de MDL-41792 fix calendar test typos 2013-10-08 23:08:27 +02:00
Damyon Wiese
44585a1ecd Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle 2013-10-08 16:03:46 +08:00
Eloy Lafuente (stronk7)
10d13aaf25 MDL-42188 shifter: delete some orphaned files 2013-10-07 21:44:13 +02:00
Mark Nelson
bcd5c6a958 MDL-41792 core_calendar: added some behat tests to cover calendar functionality 2013-10-04 16:17:03 +08:00
Mark Nelson
070bd1db6f MDL-41792 core_calendar: added missing abstract functions to test calendar 2013-10-04 16:17:03 +08:00
Mark Nelson
da3041379a MDL-41792 core_calendar: refactored the calendar to allow the use of multiple calendar types 2013-10-04 16:17:02 +08:00
Eloy Lafuente (stronk7)
00a6df6b02 Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle 2013-10-01 15:59:06 +02:00
Sam Hemelryk
c78fdd8db3 Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle 2013-10-01 14:50:53 +13:00