moodle.git
10 years agoMerge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 6 Nov 2012 02:03:23 +0000 (10:03 +0800)]
Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle

Conflicts:
version.php

10 years agoMerge branch 'm24_MDL-36360_Missing_cachestore_file_config_get_configuration_array...
Dan Poltawski [Tue, 6 Nov 2012 01:59:16 +0000 (09:59 +0800)]
Merge branch 'm24_MDL-36360_Missing_cachestore_file_config_get_configuration_array' of git://github.com/scara/moodle

10 years agoMerge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 6 Nov 2012 01:47:56 +0000 (09:47 +0800)]
Merge branch 'wip-MDL-36379-m24' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-36347' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 6 Nov 2012 01:41:56 +0000 (09:41 +0800)]
Merge branch 'MDL-36347' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 6 Nov 2012 01:35:31 +0000 (09:35 +0800)]
Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle

10 years agoMDL-35998 admin: Fixed whitespace
Sam Hemelryk [Tue, 6 Nov 2012 01:32:18 +0000 (14:32 +1300)]
MDL-35998 admin: Fixed whitespace

10 years agoMDL-36379 user_view: fixed issue with page layout when editing was on
Sam Hemelryk [Tue, 6 Nov 2012 01:01:14 +0000 (14:01 +1300)]
MDL-36379 user_view: fixed issue with page layout when editing was on

10 years agoMDL-35381 added consistent sorting to the new selector (MDL-34657)
Eloy Lafuente (stronk7) [Mon, 5 Nov 2012 23:44:42 +0000 (00:44 +0100)]
MDL-35381 added consistent sorting to the new selector (MDL-34657)

10 years agoMDL-35381 limit teachers to do permissions checks of enrolled users only
Petr Škoda [Sat, 15 Sep 2012 18:54:40 +0000 (20:54 +0200)]
MDL-35381 limit teachers to do permissions checks of enrolled users only

10 years agoMerge branch 'MDL-35998' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 5 Nov 2012 22:00:16 +0000 (11:00 +1300)]
Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle

Conflicts:
version.php

10 years agoMerge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 5 Nov 2012 21:34:06 +0000 (10:34 +1300)]
Merge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-31629-master' of git://github.com/micaherne/moodle
Sam Hemelryk [Mon, 5 Nov 2012 21:08:43 +0000 (10:08 +1300)]
Merge branch 'MDL-31629-master' of git://github.com/micaherne/moodle

10 years agoRevert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"
Dan Poltawski [Mon, 5 Nov 2012 07:19:58 +0000 (15:19 +0800)]
Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled"

This reverts commit 45f93db912a17b778aca4b9ced16de79ff18abaa.
This reverts commit 3f798d4a3d11416c4c71df2038c1ec9422898e5e.

10 years agoMDL-35260 - version bump for course format settings
Dan Poltawski [Mon, 5 Nov 2012 07:01:58 +0000 (15:01 +0800)]
MDL-35260 - version bump for course format settings

10 years agoMDL-35260 - fix trailing whitespace
Dan Poltawski [Mon, 5 Nov 2012 07:05:13 +0000 (15:05 +0800)]
MDL-35260 - fix trailing whitespace

10 years agoMerge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 5 Nov 2012 07:04:25 +0000 (15:04 +0800)]
Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-35768 - fix trailing whitespace
Dan Poltawski [Mon, 5 Nov 2012 06:46:00 +0000 (14:46 +0800)]
MDL-35768 - fix trailing whitespace

10 years agoMDL-35768 - fix E_STRICT issue
Dan Poltawski [Mon, 5 Nov 2012 06:31:54 +0000 (14:31 +0800)]
MDL-35768 - fix E_STRICT issue

10 years agoMDL-35768 - increment redirect_if_major_upgrade_required
Dan Poltawski [Mon, 5 Nov 2012 06:25:24 +0000 (14:25 +0800)]
MDL-35768 - increment redirect_if_major_upgrade_required

10 years agoMerge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 5 Nov 2012 06:08:28 +0000 (14:08 +0800)]
Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-34270_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 5 Nov 2012 06:05:48 +0000 (14:05 +0800)]
Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

10 years agoMDL-34527 - fix trailing whitespace
Dan Poltawski [Mon, 5 Nov 2012 05:28:16 +0000 (13:28 +0800)]
MDL-34527 - fix trailing whitespace

10 years agoMerge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 5 Nov 2012 05:25:10 +0000 (13:25 +0800)]
Merge branch 'wip-MDL-34527-m24' of git://github.com/samhemelryk/moodle

10 years agoMDL-34270 blocks: Adding clonepermissionsfrom to the new capability definitions
Mark Nelson [Mon, 5 Nov 2012 04:28:09 +0000 (12:28 +0800)]
MDL-34270 blocks: Adding clonepermissionsfrom to the new capability definitions

10 years agoMDL-35260 Course formats may have settings, be enabled, disabled and uninstalled
Marina Glancy [Thu, 18 Oct 2012 08:03:11 +0000 (16:03 +0800)]
MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled

10 years agoMDL-36017 renamed formatoptions to courseformatoptions in externallib
Marina Glancy [Mon, 5 Nov 2012 03:40:03 +0000 (11:40 +0800)]
MDL-36017 renamed formatoptions to courseformatoptions in externallib

10 years agoMerge branch 'WIP-MDL-36069-master' of git://github.com/nadavkav/moodle
Dan Poltawski [Mon, 5 Nov 2012 03:31:46 +0000 (11:31 +0800)]
Merge branch 'WIP-MDL-36069-master' of git://github.com/nadavkav/moodle

10 years agoMDL-21625 question: Fixed phpdocs
Sam Hemelryk [Mon, 5 Nov 2012 03:29:28 +0000 (16:29 +1300)]
MDL-21625 question: Fixed phpdocs

10 years agoMerge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 5 Nov 2012 03:27:43 +0000 (16:27 +1300)]
Merge branch 'MDL-21625_b' of git://github.com/rwijaya/moodle

10 years agoMDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary
Marina Glancy [Fri, 2 Nov 2012 06:32:17 +0000 (14:32 +0800)]
MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary

- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats

10 years agoMerge branch 'MDL-33621' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 5 Nov 2012 03:12:32 +0000 (11:12 +0800)]
Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'wip-mdl-35787' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 5 Nov 2012 02:58:46 +0000 (10:58 +0800)]
Merge branch 'wip-mdl-35787' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Mon, 5 Nov 2012 02:27:57 +0000 (10:27 +0800)]
Merge branch 'wip-MDL-31824-master' of git://github.com/phalacee/moodle

10 years agoMerge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Mon, 5 Nov 2012 02:07:21 +0000 (15:07 +1300)]
Merge branch 'MDL-36107b' of git://github.com/srynot4sale/moodle

10 years agoMDL-36362 cache: added simpledata definition option
Sam Hemelryk [Sun, 4 Nov 2012 21:28:07 +0000 (10:28 +1300)]
MDL-36362 cache: added simpledata definition option

10 years agoMerge branch 'm24_MDL-36359_Typo_admin_rediect' of https://github.com/scara/moodle
Sam Hemelryk [Sun, 4 Nov 2012 19:35:25 +0000 (08:35 +1300)]
Merge branch 'm24_MDL-36359_Typo_admin_rediect' of https://github.com/scara/moodle

10 years agoMDL-36360 Removed 'lock': cachestore_file_addinstance_form::configuration_definition...
Matteo Scaramuccia [Sun, 4 Nov 2012 18:57:54 +0000 (19:57 +0100)]
MDL-36360 Removed 'lock': cachestore_file_addinstance_form::configuration_definition() doesn't include it

10 years agoMDL-36360 Missing of cachestore_file::config_get_configuration_array()
Matteo Scaramuccia [Sun, 4 Nov 2012 18:41:22 +0000 (19:41 +0100)]
MDL-36360 Missing of cachestore_file::config_get_configuration_array()

10 years agoMDL-36359 Typo prevents 'Cancel' action in 'Add instance' to work as expected
Matteo Scaramuccia [Sun, 4 Nov 2012 17:51:03 +0000 (18:51 +0100)]
MDL-36359 Typo prevents 'Cancel' action in 'Add instance' to work as expected

10 years agoMDL-36347 quiz: formchangechecker should not obstruct auto-submit.
Tim Hunt [Sat, 3 Nov 2012 07:36:13 +0000 (18:36 +1100)]
MDL-36347 quiz: formchangechecker should not obstruct auto-submit.

When the quiz time limit runs out, the quiz should be submitted
automatically, withouth formchangechecker popping up a dialogue.

10 years agoMDL-35998 get_site_info return current_language()
Jerome Mouneyrac [Fri, 2 Nov 2012 10:03:20 +0000 (18:03 +0800)]
MDL-35998 get_site_info return current_language()

10 years agoMerge branch 'MDL-34270_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 2 Nov 2012 06:52:33 +0000 (14:52 +0800)]
Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle

10 years agoMDL-34270 blocks: adding new add block capabilities
Mark Nelson [Fri, 2 Nov 2012 06:32:01 +0000 (14:32 +0800)]
MDL-34270 blocks: adding new add block capabilities

10 years agoMDL-35768 MDL-36017 code style corrections
Marina Glancy [Fri, 2 Nov 2012 05:52:28 +0000 (13:52 +0800)]
MDL-35768 MDL-36017 code style corrections

10 years agoMerge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 2 Nov 2012 04:07:11 +0000 (12:07 +0800)]
Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle

10 years agoMDL-36017 IMS-CC export does not filter result by numsections because it is now optional
Marina Glancy [Tue, 16 Oct 2012 05:50:42 +0000 (13:50 +0800)]
MDL-36017 IMS-CC export does not filter result by numsections because it is now optional

10 years agoMDL-36017 Course now may have format-specific options, numsections and hiddensections...
Marina Glancy [Wed, 17 Oct 2012 03:44:43 +0000 (11:44 +0800)]
MDL-36017 Course now may have format-specific options, numsections and hiddensections are among them

10 years agoMDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specifi...
Marina Glancy [Thu, 11 Oct 2012 07:08:17 +0000 (15:08 +0800)]
MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options

- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object

10 years agoMDL-36017 Added default fields to format_legacy::course_format_options()
Marina Glancy [Fri, 12 Oct 2012 02:26:33 +0000 (10:26 +0800)]
MDL-36017 Added default fields to format_legacy::course_format_options()

Fields coursedisplay, numsections, hiddensections are now the default fields for formats being converted from Moodle 2.3 or earlier

10 years agoMDL-35768 Backup and restore of course format-specific options
Marina Glancy [Thu, 11 Oct 2012 08:36:25 +0000 (16:36 +0800)]
MDL-35768 Backup and restore of course format-specific options

10 years agoMDL-35768 Backup and restore of section format-specific options
Marina Glancy [Thu, 11 Oct 2012 08:03:15 +0000 (16:03 +0800)]
MDL-35768 Backup and restore of section format-specific options

10 years agoMDL-35768 Allow caching of section format options in course.sectioncache
Marina Glancy [Tue, 16 Oct 2012 04:02:56 +0000 (12:02 +0800)]
MDL-35768 Allow caching of section format options in course.sectioncache

10 years agoMDL-35768 Added format-specific options to edit course and section forms
Marina Glancy [Thu, 11 Oct 2012 05:31:55 +0000 (13:31 +0800)]
MDL-35768 Added format-specific options to edit course and section forms

- Course format may define additional fields (format options) to store for course and each section
- Edit course form allows to edit format-specific options and refreshes their list on format change
- Course format may provide it's own form for editing a section
- Default form for editing section allows to edit all format-specific fields
- Class section_info refactored, it defines magic methods such as __get() to access basic section
  information and format-specific options (retrieved only on the first request)
- format_base::update_course_format_options() allows to watch pre-update state of the course,
  format_legacy automatically copies the options with the same names between formats

10 years agoMDL-35768 create table course_format_options, increase length of course.format field
Marina Glancy [Thu, 4 Oct 2012 04:34:55 +0000 (12:34 +0800)]
MDL-35768 create table course_format_options, increase length of course.format field

10 years agoMDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle.
Sam Hemelryk [Thu, 4 Oct 2012 03:20:43 +0000 (16:20 +1300)]
MDL-34527 forum: Fixed up a couple of SQL queries causing issues in Oracle.

10 years agoMDL-36069 - Right align TEXTAREA "Format selector" listbox, when in RTL mode (theme...
Nadav Kavalerchik [Tue, 16 Oct 2012 08:19:31 +0000 (10:19 +0200)]
MDL-36069 - Right align TEXTAREA "Format selector" listbox, when in RTL mode (theme/standard)

10 years agoMDL-36023 AJAX Move the instantiation of the dialogue to display time
Andrew Robert Nicols [Fri, 12 Oct 2012 09:41:33 +0000 (10:41 +0100)]
MDL-36023 AJAX Move the instantiation of the dialogue to display time

10 years agoweekly release 2.4dev
Dan Poltawski [Thu, 1 Nov 2012 06:52:00 +0000 (14:52 +0800)]
weekly release 2.4dev

10 years agoFix incorrect permissions
Dan Poltawski [Thu, 1 Nov 2012 06:51:29 +0000 (14:51 +0800)]
Fix incorrect permissions

10 years agoweekly release 2.4dev
Dan Poltawski [Thu, 1 Nov 2012 06:15:24 +0000 (14:15 +0800)]
weekly release 2.4dev

10 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Thu, 1 Nov 2012 06:12:49 +0000 (14:12 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

10 years agoRevert "MDL-34332 completion: timeenrolled not always set correctly"
Dan Poltawski [Thu, 1 Nov 2012 04:02:49 +0000 (12:02 +0800)]
Revert "MDL-34332 completion: timeenrolled not always set correctly"

This reverts commit 154a72b0024761f8fe57ede5aa1b2255a1c2babd.

10 years agoMDL-25290 MUC - add dbname to settings hash
Dan Poltawski [Thu, 1 Nov 2012 02:40:32 +0000 (10:40 +0800)]
MDL-25290 MUC - add dbname to settings hash

10 years agoMerge branch 'MDL-36315' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 1 Nov 2012 02:02:47 +0000 (10:02 +0800)]
Merge branch 'MDL-36315' of git://github.com/stronk7/moodle

10 years agoMerge branch 'MDL-34910_fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 1 Nov 2012 01:56:46 +0000 (09:56 +0800)]
Merge branch 'MDL-34910_fix' of git://github.com/dmonllao/moodle

10 years agoMDL-36315 backup: reduce the DST tests failing-window
Eloy Lafuente (stronk7) [Wed, 31 Oct 2012 23:28:59 +0000 (00:28 +0100)]
MDL-36315 backup: reduce the DST tests failing-window

This reduces the period of time that some of the unit tests
for calculate_next_automated_backup() are failing right now
(from 1week to just some hours around the DST changes).

Note it's not the final solution because they will still fail
when New_York or Brussels DST changes are about to happen, but
to get this completely fixed we'll need to wait to switch from
current custom TZ/DST support to PHP built-in one.

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 1 Nov 2012 00:36:37 +0000 (00:36 +0000)]
Automatically generated installer lang files

10 years agoMDL-36304 - Left align "marked out of" in RTL Q preview
Eloy Lafuente (stronk7) [Wed, 31 Oct 2012 18:30:08 +0000 (19:30 +0100)]
MDL-36304 - Left align "marked out of" in RTL Q preview

Credit goes to Nadav Kavalerchik for fixing it @ MDL-36033

10 years agoMDL-35998 move mobile under web services + leave enable mobile under manage web servi...
Jerome Mouneyrac [Wed, 31 Oct 2012 09:10:42 +0000 (17:10 +0800)]
MDL-35998 move mobile under web services + leave enable mobile under manage web service too

10 years agoMerge branch 'MDL-36130' of git://github.com/aolley/moodle
Aparup Banerjee [Wed, 31 Oct 2012 06:51:16 +0000 (14:51 +0800)]
Merge branch 'MDL-36130' of git://github.com/aolley/moodle

10 years agoMDL-35964 - blocks: add missing global $CFG
Dan Poltawski [Wed, 31 Oct 2012 06:28:24 +0000 (14:28 +0800)]
MDL-35964 - blocks: add missing global $CFG

Thanks Rosie!

10 years agoMDL-35998 New mobile menu: with CSS url + existing enable mobile web services
Jerome Mouneyrac [Thu, 18 Oct 2012 07:13:58 +0000 (15:13 +0800)]
MDL-35998 New mobile menu: with CSS url + existing enable mobile web services

10 years agoMerge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 31 Oct 2012 05:42:14 +0000 (13:42 +0800)]
Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle

10 years agoMDL-28235 form: Removed reference to unexisting close button in help popup
Frederic Massart [Wed, 31 Oct 2012 04:59:07 +0000 (12:59 +0800)]
MDL-28235 form: Removed reference to unexisting close button in help popup

10 years agoMDL-34910 blog Fixing mod level related issues
David Monllao [Wed, 31 Oct 2012 03:56:36 +0000 (11:56 +0800)]
MDL-34910 blog Fixing mod level related issues

10 years agoMDL-28235 form: Removed close icon of help icon popups
Frederic Massart [Tue, 2 Oct 2012 06:34:15 +0000 (14:34 +0800)]
MDL-28235 form: Removed close icon of help icon popups

10 years agoMDL-28235 form: Help button popup close accessibility improved
Frederic Massart [Tue, 2 Oct 2012 06:28:55 +0000 (14:28 +0800)]
MDL-28235 form: Help button popup close accessibility improved

AMOS BEGIN
 CPY [close,editor],[close,form]
AMOS END

10 years agoMerge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle
Sam Hemelryk [Wed, 31 Oct 2012 04:35:18 +0000 (17:35 +1300)]
Merge branch 'w43_MDL-36145_m24_yui373' of git://github.com/skodak/moodle

10 years agoMDL-34777 Accessibility: Add proper id to select input
Rajesh Taneja [Wed, 31 Oct 2012 03:32:44 +0000 (11:32 +0800)]
MDL-34777 Accessibility: Add proper id to select input

10 years agoMerge branch 'wip-mdl-29762' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 31 Oct 2012 02:50:44 +0000 (10:50 +0800)]
Merge branch 'wip-mdl-29762' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-31708-master' of git://github.com/StudiUM/moodle
Aparup Banerjee [Wed, 31 Oct 2012 02:04:56 +0000 (10:04 +0800)]
Merge branch 'MDL-31708-master' of git://github.com/StudiUM/moodle

10 years agoMerge branch 'wip-mdl-34777' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 31 Oct 2012 01:59:44 +0000 (09:59 +0800)]
Merge branch 'wip-mdl-34777' of git://github.com/rajeshtaneja/moodle

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 31 Oct 2012 00:36:33 +0000 (00:36 +0000)]
Automatically generated installer lang files

10 years agoMerge branch 'MDL-31934_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 30 Oct 2012 21:15:44 +0000 (10:15 +1300)]
Merge branch 'MDL-31934_master' of git://github.com/lazydaisy/moodle

10 years agoMDL-31934 mod/forum: Added CSS fix to mod/forum/styles.css for unread forumposts...
Mary Evans [Tue, 30 Oct 2012 11:34:02 +0000 (11:34 +0000)]
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.

10 years agoMerge branch 'MDL-34332c' of git://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 30 Oct 2012 08:20:39 +0000 (16:20 +0800)]
Merge branch 'MDL-34332c' of git://github.com/srynot4sale/moodle

10 years agoMerge branch 'MDL-35386b' of git://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 30 Oct 2012 08:12:56 +0000 (16:12 +0800)]
Merge branch 'MDL-35386b' of git://github.com/srynot4sale/moodle

10 years agoMerge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 30 Oct 2012 08:05:43 +0000 (16:05 +0800)]
Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle

10 years agoMDL-16660 calendar - remove cron strings
Dan Poltawski [Tue, 30 Oct 2012 07:27:02 +0000 (15:27 +0800)]
MDL-16660 calendar - remove cron strings

We don't translate cronjobs

10 years agoMDL-16660 calendar: remove get_ical_data() from form
Dan Poltawski [Tue, 30 Oct 2012 06:56:39 +0000 (14:56 +0800)]
MDL-16660 calendar: remove get_ical_data() from form

This code was only called in one path and so was not necessary.

10 years agoMDL-16660 - upgrade: split steps up into two
Dan Poltawski [Tue, 30 Oct 2012 06:33:30 +0000 (14:33 +0800)]
MDL-16660 - upgrade: split steps up into two

Be extra safe for potential debugging purposes

10 years agoMerge branch 'wip-MDL-16660-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Oct 2012 06:18:13 +0000 (14:18 +0800)]
Merge branch 'wip-MDL-16660-m24' of git://github.com/samhemelryk/moodle

Conflicts:
lib/db/upgrade.php
version.php

10 years agoMerge branch 'wip-MDL-36094-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Oct 2012 05:44:38 +0000 (13:44 +0800)]
Merge branch 'wip-MDL-36094-m24' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-32326-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Oct 2012 05:40:24 +0000 (13:40 +0800)]
Merge branch 'wip-MDL-32326-m24' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 30 Oct 2012 04:37:06 +0000 (17:37 +1300)]
Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle

10 years agoMDL-16660 calendar: Cleaned u several areas of the iCal patch in preparation of the...
Sam Hemelryk [Mon, 15 Oct 2012 08:31:12 +0000 (16:31 +0800)]
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

10 years agoMDL-16660: WIP - fixes as per review
Jonathan Harker [Thu, 11 Oct 2012 22:57:32 +0000 (11:57 +1300)]
MDL-16660: WIP - fixes as per review

10 years agoMDL-16660: Add calendar import.
Jonathan Harker [Mon, 23 Jul 2012 01:49:43 +0000 (13:49 +1200)]
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.

10 years agoMerge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Tue, 30 Oct 2012 04:14:40 +0000 (12:14 +0800)]
Merge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'wip-mdl-35489' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 30 Oct 2012 04:11:44 +0000 (12:11 +0800)]
Merge branch 'wip-mdl-35489' of git://github.com/rajeshtaneja/moodle