moodle.git
6 years agoMerge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 22 Sep 2015 14:11:10 +0000 (15:11 +0100)]
Merge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle

6 years agoMDL-51107 navigationlib: Plugins can extend navigation category settings
Frederic Massart [Fri, 18 Sep 2015 09:06:52 +0000 (17:06 +0800)]
MDL-51107 navigationlib: Plugins can extend navigation category settings

6 years agoMerge branch 'MDL-50541-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Sep 2015 13:37:22 +0000 (14:37 +0100)]
Merge branch 'MDL-50541-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-50349-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Sep 2015 11:57:14 +0000 (12:57 +0100)]
Merge branch 'MDL-50349-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-50536-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Sep 2015 11:55:46 +0000 (12:55 +0100)]
Merge branch 'MDL-50536-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-50132-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 22 Sep 2015 11:46:39 +0000 (12:46 +0100)]
Merge branch 'MDL-50132-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 22 Sep 2015 10:48:49 +0000 (11:48 +0100)]
Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Tue, 22 Sep 2015 09:06:53 +0000 (10:06 +0100)]
Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 22 Sep 2015 08:44:44 +0000 (09:44 +0100)]
Merge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle

6 years agoMDL-50917 navigation: fix incorrect @since
Dan Poltawski [Tue, 22 Sep 2015 08:36:06 +0000 (09:36 +0100)]
MDL-50917 navigation: fix incorrect @since

6 years agoMerge branch 'wip-MDL-50917-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 22 Sep 2015 08:15:57 +0000 (09:15 +0100)]
Merge branch 'wip-MDL-50917-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-51412_qtype_index' of git://github.com/davosmith/moodle
Dan Poltawski [Tue, 22 Sep 2015 07:58:57 +0000 (08:58 +0100)]
Merge branch 'MDL-51412_qtype_index' of git://github.com/davosmith/moodle

6 years agoMDL-51222 javascript: Merge all the YUI instances
Damyon Wiese [Tue, 22 Sep 2015 06:56:22 +0000 (14:56 +0800)]
MDL-51222 javascript: Merge all the YUI instances

We previously had a global Y (simpleyui) and a separate Y created
to put Y in scope for all our modules. This meant that we had 2
separate sandboxes for YUI, which means that modules are duplicated,
and events do not fire across YUI instances.

This change merges the 2 instances, so any code refering to Y will
get the same instance of YUI (amd code, yui modules, static init code etc).

Thanks to Andrew Nicols!

6 years agoMDL-51222 Javascript: Trigger events for filters on DOM insertion
Damyon Wiese [Thu, 27 Aug 2015 09:15:17 +0000 (17:15 +0800)]
MDL-51222 Javascript: Trigger events for filters on DOM insertion

When nodes are added to the dom, they may need to be re-processed by a JS based
filter. To do this we need to trigger the legacy YUI event filter-content-updated.

To make this easier I added some wrappers to template that will insert the node, run any
JS and trigger the event.

I also changed existing yui code to call the amd function to trigger the event. This way
all jquery and yui listeners will always be notified.

6 years agoMerge branch 'MDL-46157-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 22 Sep 2015 07:15:01 +0000 (08:15 +0100)]
Merge branch 'MDL-46157-master' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-51413-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 22 Sep 2015 04:22:55 +0000 (12:22 +0800)]
Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle

6 years agoMDL-50917 navigation: Behat tests for viewing user preference page.
Adrian Greeve [Thu, 10 Sep 2015 05:22:40 +0000 (13:22 +0800)]
MDL-50917 navigation: Behat tests for viewing user preference page.

6 years agoMDL-50917 navigation: Unit test for viewing preference page.
Adrian Greeve [Thu, 10 Sep 2015 01:46:06 +0000 (09:46 +0800)]
MDL-50917 navigation: Unit test for viewing preference page.

6 years agoMDL-50917 navigation: Allow users with permission to access preferences.
Adrian Greeve [Wed, 9 Sep 2015 06:11:34 +0000 (14:11 +0800)]
MDL-50917 navigation: Allow users with permission to access preferences.

6 years agoMerge branch 'MDL-51190-master' of https://github.com/pauln/moodle
Andrew Nicols [Mon, 21 Sep 2015 23:53:27 +0000 (07:53 +0800)]
Merge branch 'MDL-51190-master' of https://github.com/pauln/moodle

6 years agoMerge branch 'MDL-51330-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 21 Sep 2015 11:10:35 +0000 (12:10 +0100)]
Merge branch 'MDL-51330-master' of https://github.com/sammarshallou/moodle

6 years agoMerge branch 'MDL-51403-master-clilang' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 21 Sep 2015 10:45:15 +0000 (11:45 +0100)]
Merge branch 'MDL-51403-master-clilang' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Sep 2015 09:53:29 +0000 (10:53 +0100)]
Merge branch 'MDL-51052_master' of https://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 21 Sep 2015 09:14:47 +0000 (10:14 +0100)]
Merge branch 'MDL-48165-master-dimgrades' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-50332_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 21 Sep 2015 07:43:02 +0000 (15:43 +0800)]
Merge branch 'MDL-50332_master' of git://github.com/dmonllao/moodle

6 years agoMDL-50332 enrol_self: Formatting unavailable instances error messages
David Monllao [Mon, 21 Sep 2015 05:31:10 +0000 (13:31 +0800)]
MDL-50332 enrol_self: Formatting unavailable instances error messages

Many thanks to Andrew Nicols as this patch is based on his
proposal. Thanks Andrew.

6 years agoMDL-50541 mod_imscp: New Web Service mod_imscp_get_imscps_by_courses
Juan Leyva [Tue, 15 Sep 2015 15:55:48 +0000 (17:55 +0200)]
MDL-50541 mod_imscp: New Web Service mod_imscp_get_imscps_by_courses

6 years agoMDL-50536 mod_book: New WS mod_book_get_books_by_courses
Juan Leyva [Wed, 16 Sep 2015 11:01:59 +0000 (13:01 +0200)]
MDL-50536 mod_book: New WS mod_book_get_books_by_courses

6 years agoMDL-50132 mod_choice: New WS mod_choice_get_choices_by_courses
Juan Leyva [Wed, 16 Sep 2015 09:02:20 +0000 (11:02 +0200)]
MDL-50132  mod_choice: New WS mod_choice_get_choices_by_courses

6 years agoMerge branch 'MDL-50790-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Mon, 21 Sep 2015 06:31:49 +0000 (14:31 +0800)]
Merge branch 'MDL-50790-master' of git://github.com/cameron1729/moodle

6 years agoMDL-50790 tests: Fix outlook fixture.
Cameron Ball [Mon, 21 Sep 2015 05:08:18 +0000 (13:08 +0800)]
MDL-50790 tests: Fix outlook fixture.

6 years agoMDL-50790 inbound: Stop incorrect amount of lines getting removed.
Cameron Ball [Mon, 21 Sep 2015 05:01:02 +0000 (13:01 +0800)]
MDL-50790 inbound: Stop incorrect amount of lines getting removed.

Too many lines were being removed for GMail senders. The function was
also removed because it is no longer used, and guessing the client
and cutting accordingly is a poor approach and will probably lead
to issues similar to this one.

6 years agoMDL-50790 messageinbound: fixture for gmail
Dan Poltawski [Wed, 8 Jul 2015 11:24:46 +0000 (12:24 +0100)]
MDL-50790 messageinbound: fixture for gmail

6 years agoMerge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 21 Sep 2015 04:05:32 +0000 (12:05 +0800)]
Merge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-51311-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 21 Sep 2015 03:32:55 +0000 (11:32 +0800)]
Merge branch 'MDL-51311-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-51431' of https://github.com/andrewhancox/moodle
Andrew Nicols [Mon, 21 Sep 2015 00:09:38 +0000 (08:09 +0800)]
Merge branch 'MDL-51431' of https://github.com/andrewhancox/moodle

6 years agoMDL-51413 forum: Return additional field in get_forums_by_courses WS
Juan Leyva [Tue, 15 Sep 2015 09:23:38 +0000 (11:23 +0200)]
MDL-51413 forum: Return additional field in get_forums_by_courses WS

6 years agoMDL-51052 dml: More info about mysql and case & accent sensitiveness
David Monllao [Fri, 18 Sep 2015 03:42:12 +0000 (11:42 +0800)]
MDL-51052 dml: More info about mysql and case & accent sensitiveness

6 years agoMDL-46878 blocklib: Testing blocks_delete_instances()
Frederic Massart [Fri, 28 Aug 2015 09:41:44 +0000 (17:41 +0800)]
MDL-46878 blocklib: Testing blocks_delete_instances()

6 years agoMDL-46878 my: Behat tests to cover reset of all customised pages
Frederic Massart [Fri, 28 Aug 2015 06:10:37 +0000 (14:10 +0800)]
MDL-46878 my: Behat tests to cover reset of all customised pages

6 years agoMDL-46878 my: Allow admins to reset everyone's dashboard
Frederic Massart [Thu, 27 Aug 2015 10:20:59 +0000 (18:20 +0800)]
MDL-46878 my: Allow admins to reset everyone's dashboard

6 years agoMDL-51052 dml: support for sql_like() under utf8_bin
Charles Fulton [Tue, 11 Aug 2015 12:35:09 +0000 (12:35 +0000)]
MDL-51052 dml: support for sql_like() under utf8_bin

6 years agoMDL-51108 mod_data: Addition to behat test for Lat. and Long.
Adrian Greeve [Mon, 14 Sep 2015 06:13:35 +0000 (14:13 +0800)]
MDL-51108 mod_data: Addition to behat test for Lat. and Long.

6 years agoMDL-51108 mod_data: Add validation for Lat. and Long.
Adrian Greeve [Mon, 14 Sep 2015 02:03:11 +0000 (10:03 +0800)]
MDL-51108 mod_data: Add validation for Lat. and Long.

Added a check to see that both the Lat. and Long. values
are entered when filling in database module entries.

6 years agoMDL-51403 install: Improve the language validation in the CLI installer
David Mudrák [Tue, 15 Sep 2015 20:08:04 +0000 (22:08 +0200)]
MDL-51403 install: Improve the language validation in the CLI installer

There are two essential improvements here. Firstly, by replacing the
file_exists() check with array_key_exists() we make sure that only
actual language code will be written into the config.php file (and not
the empty value in case of input that does not pass the PARAM_SAFEDIR
cleaning).

Additionally, we no longer display the full list of available languages
by default. The list can be displayed in the interactive mode by typing
the ? character instead of the language code. This makes the overall
interface cleaner, does not cause the header information (such as the
Moodle version) to scroll away and makes the nice cli logo more visible
(which was the main motivation for the whole patch anyway ;-).

6 years agoMDL-50349 scorm: New WS mod_scorm_get_scorms_by_courses
Juan Leyva [Mon, 1 Jun 2015 11:35:18 +0000 (13:35 +0200)]
MDL-50349 scorm: New WS mod_scorm_get_scorms_by_courses

6 years agoweekly release 3.0dev
Eloy Lafuente (stronk7) [Thu, 17 Sep 2015 16:01:12 +0000 (18:01 +0200)]
weekly release 3.0dev

6 years agoMerge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 17 Sep 2015 09:28:31 +0000 (11:28 +0200)]
Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle

6 years agoMDL-30157 enrol_manual: timestart a few seconds before
David Monllao [Thu, 17 Sep 2015 09:06:53 +0000 (17:06 +0800)]
MDL-30157 enrol_manual: timestart a few seconds before

We want to prevent conflicts with get_enrolled_sql trick for db caching
plus users should be able to access the course once enrolled.

6 years agoMDL-50664 mod_data: tests for 'manageapproved' setting.
Ryan Wyllie [Thu, 6 Aug 2015 04:08:16 +0000 (04:08 +0000)]
MDL-50664 mod_data: tests for 'manageapproved' setting.

Adding test coverage for the 'manageapproved' setting that
was added by Johannes Burk.

6 years agoMDL-50959 gradebook: fix XML grade export
Simey Lameze [Thu, 17 Sep 2015 00:36:20 +0000 (08:36 +0800)]
MDL-50959 gradebook: fix XML grade export

6 years agoMerge branch 'MDL-50557-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 16 Sep 2015 21:24:39 +0000 (23:24 +0200)]
Merge branch 'MDL-50557-master' of git://github.com/jleyva/moodle

6 years agoMDL-50557 scorm: Add attempt field in mod_scorm_get_scorm_sco_tracks
Juan Leyva [Wed, 16 Sep 2015 21:02:02 +0000 (23:02 +0200)]
MDL-50557 scorm: Add attempt field in mod_scorm_get_scorm_sco_tracks

6 years agoMDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks
Juan Leyva [Fri, 12 Jun 2015 11:13:18 +0000 (13:13 +0200)]
MDL-50557 mod_scorm: New WS mod_scorm_get_scorm_sco_tracks

6 years agoMerge branch 'MDL-50353-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 16 Sep 2015 21:15:59 +0000 (23:15 +0200)]
Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle

6 years agoMDL-50353 mod_scorm: Fix problem with ids ordering in tests
Juan Leyva [Wed, 16 Sep 2015 21:14:11 +0000 (23:14 +0200)]
MDL-50353 mod_scorm: Fix problem with ids ordering in tests

6 years agoMerge branch 'MDL-50353-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 16 Sep 2015 20:11:55 +0000 (22:11 +0200)]
Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle

6 years agoMDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks
Juan Leyva [Wed, 10 Jun 2015 11:15:42 +0000 (13:15 +0200)]
MDL-50353 scorm: New Web Service mod_scorm_insert_scorm_tracks

6 years agoMDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data
Juan Leyva [Wed, 10 Jun 2015 14:55:50 +0000 (16:55 +0200)]
MDL-50352 scorm: New Web Service mod_scorm_get_scorm_user_data

6 years agoMDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes
Juan Leyva [Tue, 9 Jun 2015 21:17:49 +0000 (23:17 +0200)]
MDL-50351 scorm: New Web Service mod_scorm_get_scorm_scoes

6 years agoMDL-51431 enrol_flatfile: Fix for startdate when updating users
Andrew Hancox [Wed, 16 Sep 2015 09:49:18 +0000 (10:49 +0100)]
MDL-51431 enrol_flatfile: Fix for startdate when updating users

6 years agoMDL-51217 auth: check if recaptcha enabled for current plugin
Marina Glancy [Wed, 16 Sep 2015 07:30:04 +0000 (15:30 +0800)]
MDL-51217 auth: check if recaptcha enabled for current plugin

6 years agoMDL-46705 admin: Validate unique shortname for frontpage course
Marina Glancy [Wed, 16 Sep 2015 06:38:52 +0000 (14:38 +0800)]
MDL-46705 admin: Validate unique shortname for frontpage course

6 years agoMDL-48881 mod_lesson: A couple of performance improvements
David Monllao [Wed, 16 Sep 2015 05:32:29 +0000 (13:32 +0800)]
MDL-48881 mod_lesson: A couple of performance improvements

- Improve memory usage on db drivers not able to use recordsets
  properly
- !array_key_exists replaced by empty calls

6 years agoMerge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle
David Monllao [Wed, 16 Sep 2015 05:20:52 +0000 (13:20 +0800)]
Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-49561_master' of git://github.com/markn86/moodle
David Monllao [Wed, 16 Sep 2015 01:57:22 +0000 (09:57 +0800)]
Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle

Conflicts:
lib/bennu/readme_moodle.txt

6 years agoMerge branch 'MDL-46705-master' of git://github.com/dkns/moodle
David Monllao [Wed, 16 Sep 2015 01:44:37 +0000 (09:44 +0800)]
Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle

6 years agoMerge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle
David Monllao [Wed, 16 Sep 2015 01:10:28 +0000 (09:10 +0800)]
Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle

6 years agoMDL-50890 enrol_flatfile: Correcting typo and return
David Monllao [Wed, 16 Sep 2015 01:07:47 +0000 (09:07 +0800)]
MDL-50890 enrol_flatfile: Correcting typo and return

Would be safer to return nothing, execute methods don't have
a return. I understand this return 2 was inherited from the
previous cron function.

6 years agoMDL-50890 enrol_flatfile: Modifications for compliance with standards
Jun Pataleta [Mon, 7 Sep 2015 08:24:02 +0000 (16:24 +0800)]
MDL-50890 enrol_flatfile: Modifications for compliance with standards

Also changed the scheduled task to run every hour.

6 years agoMDL-50890 enrol_flatfile: Replace cron processing with scheduled task
Troy Williams [Tue, 21 Jul 2015 02:21:10 +0000 (14:21 +1200)]
MDL-50890 enrol_flatfile: Replace cron processing with scheduled task

Replace enrolment plugin flatfile cron processing with scheduled task

6 years agoMDL-50936 Atto: Add upgrade path for updating equations setting
Sam Chaffee [Tue, 1 Sep 2015 17:07:14 +0000 (11:07 -0600)]
MDL-50936 Atto: Add upgrade path for updating equations setting

6 years agoMDL-50936 Atto: Add missing math equation buttons
Jason Hardin [Fri, 21 Aug 2015 20:20:27 +0000 (14:20 -0600)]
MDL-50936 Atto: Add missing math equation buttons

6 years agoMerge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 16 Sep 2015 00:15:51 +0000 (02:15 +0200)]
Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-50930-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 16 Sep 2015 00:11:12 +0000 (02:11 +0200)]
Merge branch 'MDL-50930-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-49032' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 23:00:03 +0000 (01:00 +0200)]
Merge branch 'MDL-49032' of https://github.com/stronk7/moodle

6 years agoMDL-49032 lib/bennu: update readme to document the change
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 22:44:21 +0000 (00:44 +0200)]
MDL-49032 lib/bennu: update readme to document the change

6 years agoMDL-49032 lib/bennu: use HTAB only when folding lines
Joby Harding [Thu, 20 Aug 2015 09:29:16 +0000 (10:29 +0100)]
MDL-49032 lib/bennu: use HTAB only when folding lines

6 years agoMerge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 22:19:04 +0000 (00:19 +0200)]
Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-50959-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 21:36:14 +0000 (23:36 +0200)]
Merge branch 'MDL-50959-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 21:12:22 +0000 (23:12 +0200)]
Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 21:02:25 +0000 (23:02 +0200)]
Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle

6 years agoMDL-49942 core_course: bump version
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 20:53:45 +0000 (22:53 +0200)]
MDL-49942 core_course: bump version

6 years agoMerge branch 'MDL-49942-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 15 Sep 2015 20:52:13 +0000 (22:52 +0200)]
Merge branch 'MDL-49942-master' of git://github.com/jleyva/moodle

6 years agoMDL-51412 question: add index to qtype field
Davo Smith [Tue, 15 Sep 2015 09:49:05 +0000 (10:49 +0100)]
MDL-51412 question: add index to qtype field

6 years agoMDL-33564 rss: Fixing missing param type
David Monllao [Tue, 15 Sep 2015 09:58:05 +0000 (17:58 +0800)]
MDL-33564 rss: Fixing missing param type

6 years agoMerge branch 'MDL-33564-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 15 Sep 2015 09:56:20 +0000 (17:56 +0800)]
Merge branch 'MDL-33564-master' of git://github.com/danpoltawski/moodle

Conflicts:
lib/upgrade.txt

6 years agoMerge branch 'MDL-51213-master' of git://github.com/damyon/moodle
David Monllao [Tue, 15 Sep 2015 09:28:34 +0000 (17:28 +0800)]
Merge branch 'MDL-51213-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-50884-master' of git://github.com/lameze/moodle
David Monllao [Tue, 15 Sep 2015 09:15:47 +0000 (17:15 +0800)]
Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-50964-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 15 Sep 2015 09:09:33 +0000 (17:09 +0800)]
Merge branch 'MDL-50964-master' of git://github.com/jleyva/moodle

Conflicts:
group/tests/externallib_test.php
lib/db/services.php

6 years agoMerge branch 'MDL-50966-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 15 Sep 2015 08:58:54 +0000 (16:58 +0800)]
Merge branch 'MDL-50966-master' of git://github.com/jleyva/moodle

6 years agoMDL-30157 enrol_manual: New option to enrol from now
David Monllao [Thu, 18 Jun 2015 04:30:35 +0000 (12:30 +0800)]
MDL-30157 enrol_manual: New option to enrol from now

We set the new now option as the default one, as other enrol
plugins use it as the default enrolment start date. We are keeping
the default to today on upgrades.

6 years agoMDL-30157 enrol_manual: Setting proper default
David Monllao [Fri, 28 Aug 2015 03:14:55 +0000 (11:14 +0800)]
MDL-30157 enrol_manual: Setting proper default

The wrong default value was working because of count starting from 1.

6 years agoMerge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 15 Sep 2015 07:25:46 +0000 (15:25 +0800)]
Merge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle

6 years agoMDL-49942 core_course: New Web Service core_course_search_courses
Juan Leyva [Wed, 29 Apr 2015 10:10:48 +0000 (12:10 +0200)]
MDL-49942 core_course: New Web Service core_course_search_courses

6 years agoMDL-50664 mod_data: add 'manageapproved' setting.
Johannes Burk [Thu, 25 Jun 2015 15:10:34 +0000 (17:10 +0200)]
MDL-50664 mod_data: add 'manageapproved' setting.

New function data_user_can_manage_entry checks whether a user is allowed to manage an entry.
Considering manageentries capability, data_in_readonly_period() result,
ownership (determined by data_isowner()), approval and manageapproved setting.

6 years agoMerge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)]
Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle

6 years agoMDL-51048 backup: Removing unnecessary var
David Monllao [Tue, 15 Sep 2015 05:43:45 +0000 (13:43 +0800)]
MDL-51048 backup: Removing unnecessary var

6 years agoMerge branch 'MDL-51048' of git://github.com/timhunt/moodle
David Monllao [Tue, 15 Sep 2015 05:40:55 +0000 (13:40 +0800)]
Merge branch 'MDL-51048' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 15 Sep 2015 05:05:30 +0000 (13:05 +0800)]
Merge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle