moodle.git
4 years agoMDL-60564 calendar: removed unnecessary get_new_event_button()
Mark Nelson [Tue, 24 Oct 2017 07:02:12 +0000 (15:02 +0800)]
MDL-60564 calendar: removed unnecessary get_new_event_button()

4 years agoMDL-60564 calendar: removed unnecessary get_course_filter_selector()
Mark Nelson [Tue, 24 Oct 2017 09:49:26 +0000 (17:49 +0800)]
MDL-60564 calendar: removed unnecessary get_course_filter_selector()

4 years agoon-demand release 3.4dev+
Eloy Lafuente (stronk7) [Fri, 20 Oct 2017 21:55:42 +0000 (23:55 +0200)]
on-demand release 3.4dev+

4 years agoMDL-60485 modgrade: Change string expectation in related test
Eloy Lafuente (stronk7) [Fri, 20 Oct 2017 16:55:40 +0000 (18:55 +0200)]
MDL-60485 modgrade: Change string expectation in related test

4 years agoMDL-60108 registration: do not offer registration in behat tests
Marina Glancy [Fri, 20 Oct 2017 06:35:31 +0000 (14:35 +0800)]
MDL-60108 registration: do not offer registration in behat tests

4 years agoMerge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)]
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-60072 mod_lesson: Add missing name attribute
Andrew Nicols [Fri, 20 Oct 2017 03:43:15 +0000 (11:43 +0800)]
MDL-60072 mod_lesson: Add missing name attribute

4 years agoMerge branch 'wip-MDL-60485-master' of git://github.com/abgreeve/moodle
David Monllao [Fri, 20 Oct 2017 02:43:19 +0000 (04:43 +0200)]
Merge branch 'wip-MDL-60485-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-60406-master' of git://github.com/lameze/moodle
David Monllao [Fri, 20 Oct 2017 02:38:06 +0000 (04:38 +0200)]
Merge branch 'MDL-60406-master' of git://github.com/lameze/moodle

4 years agoMDL-60406 core_calendar: proper calendar dates calculation
Simey Lameze [Tue, 17 Oct 2017 01:19:14 +0000 (09:19 +0800)]
MDL-60406 core_calendar: proper calendar dates calculation

4 years agoMerge branch 'MDL-60456-master' of git://github.com/damyon/moodle
Andrew Nicols [Fri, 20 Oct 2017 02:27:20 +0000 (10:27 +0800)]
Merge branch 'MDL-60456-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-60123-master' of https://github.com/snake/moodle
David Monllao [Fri, 20 Oct 2017 00:22:11 +0000 (02:22 +0200)]
Merge branch 'MDL-60123-master' of https://github.com/snake/moodle

4 years agoMDL-60072 course: Apply correct event name for assign due date
Jun Pataleta [Thu, 19 Oct 2017 22:35:17 +0000 (11:35 +1300)]
MDL-60072 course: Apply correct event name for assign due date

4 years agoMerge branch 'MDL-60342-master' of https://github.com/patkira/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 21:23:49 +0000 (23:23 +0200)]
Merge branch 'MDL-60342-master' of https://github.com/patkira/moodle

4 years agoMerge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 21:17:26 +0000 (23:17 +0200)]
Merge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'wip-MDL-60313-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:48:40 +0000 (22:48 +0200)]
Merge branch 'wip-MDL-60313-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:30:08 +0000 (22:30 +0200)]
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:20:01 +0000 (22:20 +0200)]
Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMDL-60449 lang: Properly replace the generic string with a specific one
David Mudrák [Thu, 19 Oct 2017 15:35:06 +0000 (17:35 +0200)]
MDL-60449 lang: Properly replace the generic string with a specific one

The general string 'Publish' has been used in sense of publishing a
course on a hub - as such, it is better to keep that string together
with other related strings in the core_hub component. All these are
being reworded to 'Share'.

As this has been the only meaning of the string in the core, I am
deprecating it now. Third party plugins should better come with their
own variant of the string, should they need it.

4 years agoMDL-60449 lang: Merge English strings from the en_fix language pack
Helen Foster [Thu, 19 Oct 2017 15:19:08 +0000 (17:19 +0200)]
MDL-60449 lang: Merge English strings from the en_fix language pack

Significant string changes:

* multiple strings in core_hub - 'Publish' changed to 'Share' plus other
  wording improvements to avoid misunderstandings
* errorretrievingkey in message_airnotifier - improved wording and
  removing reference to Moodle.org
* enddate_help and courseduration_desc in core - clearer wording
  explaining what the date actually does
* restore:viewautomatedfilearea in core_role - changing wording to match
  the behaviour
* dropzones_help in qtype_ddmarker - improved wording
* autologinkeygenerationlockout in tool_mobile - updated error message
* configallowemailaddresses in core_admin - clearer description
* subscriptionmode_helpin mod_forum - removing misleading sentence about
  subscription mode changes not affecting existing users

4 years agoMerge branch 'master-MDL-60116' of https://github.com/fwsl/moodle
David Monllao [Thu, 19 Oct 2017 13:54:23 +0000 (15:54 +0200)]
Merge branch 'master-MDL-60116' of https://github.com/fwsl/moodle

4 years agoMerge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 19 Oct 2017 13:44:07 +0000 (15:44 +0200)]
Merge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 13:41:56 +0000 (15:41 +0200)]
Merge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60179_master' of git://github.com/markn86/moodle
David Monllao [Thu, 19 Oct 2017 13:26:27 +0000 (15:26 +0200)]
Merge branch 'MDL-60179_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-60378-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 19 Oct 2017 12:06:26 +0000 (14:06 +0200)]
Merge branch 'MDL-60378-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-60233-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)]
Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle
David Monllao [Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)]
Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle

4 years agoMerge branch 'MDL-60375_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Thu, 19 Oct 2017 09:03:56 +0000 (22:03 +1300)]
Merge branch 'MDL-60375_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Thu, 19 Oct 2017 09:01:21 +0000 (22:01 +1300)]
Merge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 08:51:59 +0000 (10:51 +0200)]
Merge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-60247 block_glossary_random: Skip rendundant value assign
David Monllao [Thu, 19 Oct 2017 08:36:25 +0000 (10:36 +0200)]
MDL-60247 block_glossary_random: Skip rendundant value assign

4 years agoMerge branch 'MDL-60247-multilang-html-glossary-block-titles' of https://github.com...
David Monllao [Thu, 19 Oct 2017 08:31:08 +0000 (10:31 +0200)]
Merge branch 'MDL-60247-multilang-html-glossary-block-titles' of https://github.com/lucaboesch/moodle

4 years agoMerge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle
David Monllao [Thu, 19 Oct 2017 08:18:23 +0000 (10:18 +0200)]
Merge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 19 Oct 2017 07:12:34 +0000 (09:12 +0200)]
Merge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)]
Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-60179 core: make it clear what enrolment instance is being edited
Mark Nelson [Mon, 16 Oct 2017 09:55:34 +0000 (17:55 +0800)]
MDL-60179 core: make it clear what enrolment instance is being edited

4 years agoMDL-60375 analytics: Fix incorrect var reference
David Monllao [Mon, 9 Oct 2017 09:26:43 +0000 (11:26 +0200)]
MDL-60375 analytics: Fix incorrect var reference

4 years agoMerge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle
Andrew Nicols [Thu, 19 Oct 2017 06:22:30 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle

4 years agoMDL-60456 javascript: Rebuild npm-shrinkwrap
Damyon Wiese [Thu, 19 Oct 2017 03:42:36 +0000 (11:42 +0800)]
MDL-60456 javascript: Rebuild npm-shrinkwrap

Build npm-shrinkwrap with the latest node version and only test the latest node version on travis.

4 years agoMerge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle
Damyon Wiese [Thu, 19 Oct 2017 05:00:13 +0000 (13:00 +0800)]
Merge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle

4 years agoMDL-58388 course: bump version
Damyon Wiese [Thu, 19 Oct 2017 04:54:27 +0000 (12:54 +0800)]
MDL-58388 course: bump version

Add a version bump for new admin setting

4 years agoMerge branch 'MDL-58388-master' of https://github.com/abias/moodle
Damyon Wiese [Thu, 19 Oct 2017 04:47:18 +0000 (12:47 +0800)]
Merge branch 'MDL-58388-master' of https://github.com/abias/moodle

4 years agoMerge branch 'MDL-60319-master-google-converter-bug' of https://github.com/mspall...
Andrew Nicols [Thu, 19 Oct 2017 03:27:42 +0000 (11:27 +0800)]
Merge branch 'MDL-60319-master-google-converter-bug' of https://github.com/mspall/moodle

4 years agoMDL-60485 modgrade: Update to mod settings form.
Adrian Greeve [Thu, 19 Oct 2017 02:42:02 +0000 (10:42 +0800)]
MDL-60485 modgrade: Update to mod settings form.

The message for changing the max grade in the module form
was inaccurate for modules that can not rescale.

4 years agoMerge branch 'wip-MDL-60335-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Thu, 19 Oct 2017 02:39:56 +0000 (15:39 +1300)]
Merge branch 'wip-MDL-60335-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-60469 behat: Replace I press with I click on
Andrew Nicols [Wed, 18 Oct 2017 03:04:28 +0000 (11:04 +0800)]
MDL-60469 behat: Replace I press with I click on

4 years agoMerge branch 'MDL-60468-master' of git://github.com/lameze/moodle
Andrew Nicols [Thu, 19 Oct 2017 02:23:57 +0000 (10:23 +0800)]
Merge branch 'MDL-60468-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-60372-master' of git://github.com/lameze/moodle
Jun Pataleta [Thu, 19 Oct 2017 02:20:39 +0000 (15:20 +1300)]
Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle

4 years agoMDL-60372 pix: add new icons for event types
Simey Lameze [Thu, 19 Oct 2017 01:22:41 +0000 (09:22 +0800)]
MDL-60372 pix: add new icons for event types

4 years agoMDL-60372 calendar: fix font awesome event type icons
Simey Lameze [Fri, 13 Oct 2017 06:27:08 +0000 (14:27 +0800)]
MDL-60372 calendar: fix font awesome event type icons

4 years agoMerge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Thu, 19 Oct 2017 01:01:58 +0000 (09:01 +0800)]
Merge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'mdl59843-master' of https://github.com/tlock/moodle
Jun Pataleta [Thu, 19 Oct 2017 00:22:01 +0000 (13:22 +1300)]
Merge branch 'mdl59843-master' of https://github.com/tlock/moodle

4 years agoon-demand release 3.4dev+
Eloy Lafuente (stronk7) [Wed, 18 Oct 2017 22:11:40 +0000 (00:11 +0200)]
on-demand release 3.4dev+

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Wed, 18 Oct 2017 22:11:39 +0000 (00:11 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-46269 tool_httpsreplace: Fix incorrect sorting
David Mudrák [Wed, 18 Oct 2017 17:44:58 +0000 (19:44 +0200)]
MDL-46269 tool_httpsreplace: Fix incorrect sorting

4 years agoMerge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle
Jake Dallimore [Wed, 18 Oct 2017 08:36:10 +0000 (16:36 +0800)]
Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle

4 years agoMDL-57455 mod_data: moved export tag checkbox and set default
Mark Nelson [Wed, 18 Oct 2017 07:14:41 +0000 (15:14 +0800)]
MDL-57455 mod_data: moved export tag checkbox and set default

Also capitalised string 'tags'.

AMOS BEGIN
 CPY [tags,core],[tags,mod_data]
AMOS END

4 years agoMDL-60468 calendar: fix event type defaults logic
Simey Lameze [Wed, 18 Oct 2017 07:41:05 +0000 (15:41 +0800)]
MDL-60468 calendar: fix event type defaults logic

4 years agoMerge branch 'MDL-59988_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 18 Oct 2017 06:16:12 +0000 (14:16 +0800)]
Merge branch 'MDL-59988_master-fix' of git://github.com/dmonllao/moodle

4 years agoMDL-59988 analytics: Reset trained status on clear
David Monllao [Wed, 18 Oct 2017 05:01:52 +0000 (07:01 +0200)]
MDL-59988 analytics: Reset trained status on clear

4 years agoMerge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 18 Oct 2017 04:36:00 +0000 (12:36 +0800)]
Merge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 18 Oct 2017 03:47:45 +0000 (11:47 +0800)]
Merge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle

4 years agoMDL-59987 analytics: Language string refinements
David Monllao [Wed, 18 Oct 2017 03:37:07 +0000 (05:37 +0200)]
MDL-59987 analytics: Language string refinements

All credit goes to Helen Foster.

4 years agoMDL-60342 test: Reset user agent after tests
Pat Kira [Wed, 20 Sep 2017 01:20:21 +0000 (11:20 +1000)]
MDL-60342 test: Reset user agent after tests

- Add a test that proves this useragent is not being reset after a test
- Reset user agent

4 years agoMDL-60378 mod_workshop: Add missing dimensions info
Juan Leyva [Mon, 9 Oct 2017 15:36:23 +0000 (17:36 +0200)]
MDL-60378 mod_workshop: Add missing dimensions info

We need additional info from the dimensions used like the scale items
(if used).

4 years agoMDL-59063 analytics: No need to load timesplitting method
David Monllao [Tue, 10 Oct 2017 15:14:34 +0000 (17:14 +0200)]
MDL-59063 analytics: No need to load timesplitting method

4 years agoMDL-59063 analytics: Finished courses can't be used for prediction
David Monllao [Fri, 6 Oct 2017 16:38:10 +0000 (18:38 +0200)]
MDL-59063 analytics: Finished courses can't be used for prediction

4 years agoMDL-59063 tool_analytics: New invalid analysables report
David Monllao [Fri, 6 Oct 2017 15:38:01 +0000 (17:38 +0200)]
MDL-59063 tool_analytics: New invalid analysables report

4 years agoMDL-59063 analytics: Expand analysable API to provide a name
David Monllao [Fri, 6 Oct 2017 15:37:43 +0000 (17:37 +0200)]
MDL-59063 analytics: Expand analysable API to provide a name

4 years agoMerge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)]
Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'wip-MDL-60285-master' of git://github.com/abgreeve/moodle
David Monllao [Tue, 17 Oct 2017 07:42:25 +0000 (09:42 +0200)]
Merge branch 'wip-MDL-60285-master' of git://github.com/abgreeve/moodle

4 years agoMDL-60022 analytics: Clear model predictions in UI
David Monllao [Tue, 12 Sep 2017 14:26:49 +0000 (16:26 +0200)]
MDL-60022 analytics: Clear model predictions in UI

4 years agoMDL-60108 registration: Redirect to registration form
Marina Glancy [Fri, 22 Sep 2017 05:16:57 +0000 (13:16 +0800)]
MDL-60108 registration: Redirect to registration form

- when first installed
- when manual update of registration information is required

4 years agoMDL-60108 registration: Simplify, add commnews and separate emails
Marina Glancy [Tue, 19 Sep 2017 08:22:28 +0000 (16:22 +0800)]
MDL-60108 registration: Simplify, add commnews and separate emails

4 years agoMerge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle
Jake Dallimore [Tue, 17 Oct 2017 06:27:31 +0000 (14:27 +0800)]
Merge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-60335 admin: fix encoding of nonlatin site names in blocked hosts
Marina Glancy [Tue, 17 Oct 2017 03:39:47 +0000 (11:39 +0800)]
MDL-60335 admin: fix encoding of nonlatin site names in blocked hosts

4 years agoMerge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle
Damyon Wiese [Tue, 17 Oct 2017 04:04:23 +0000 (12:04 +0800)]
Merge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle

4 years agoMerge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 17 Oct 2017 04:00:51 +0000 (12:00 +0800)]
Merge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-60063-master-2' of git://github.com/ryanwyllie/moodle
Jun Pataleta [Tue, 17 Oct 2017 03:56:53 +0000 (11:56 +0800)]
Merge branch 'MDL-60063-master-2' of git://github.com/ryanwyllie/moodle

4 years agoMDL-60063 feedback: add drag and drop of open close events
Ryan Wyllie [Sun, 24 Sep 2017 04:26:33 +0000 (04:26 +0000)]
MDL-60063 feedback: add drag and drop of open close events

4 years agoMDL-60063 feedback: show feedback events on calendar for teacher
Ryan Wyllie [Sun, 24 Sep 2017 03:31:04 +0000 (03:31 +0000)]
MDL-60063 feedback: show feedback events on calendar for teacher

4 years agoMDL-60058 assign: add missing locallib require_once calls
Ryan Wyllie [Tue, 17 Oct 2017 03:04:47 +0000 (03:04 +0000)]
MDL-60058 assign: add missing locallib require_once calls

4 years agoMerge branch 'MDL-59254-master' of git://github.com/jleyva/moodle
Jake Dallimore [Tue, 17 Oct 2017 02:33:41 +0000 (10:33 +0800)]
Merge branch 'MDL-59254-master' of git://github.com/jleyva/moodle

4 years agoMDL-60285 lib: Update to Moodle changes to loglevel.
Adrian Greeve [Tue, 17 Oct 2017 02:22:00 +0000 (10:22 +0800)]
MDL-60285 lib: Update to Moodle changes to loglevel.

4 years agoMDL-60285 lib: Update loglevel to 1.5.1
Adrian Greeve [Tue, 17 Oct 2017 02:12:53 +0000 (10:12 +0800)]
MDL-60285 lib: Update loglevel to 1.5.1

4 years agoMerge branch 'MDL-58713-master-fix' of git://github.com/junpataleta/moodle
Jake Dallimore [Tue, 17 Oct 2017 01:50:49 +0000 (09:50 +0800)]
Merge branch 'MDL-58713-master-fix' of git://github.com/junpataleta/moodle

4 years agoMDL-58713 phpunit: Add core_filter test suite
Jun Pataleta [Tue, 17 Oct 2017 01:20:31 +0000 (09:20 +0800)]
MDL-58713 phpunit: Add core_filter test suite

4 years agoMerge branch 'MDL-58713-master' of git://github.com/jleyva/moodle
Jun Pataleta [Tue, 17 Oct 2017 01:03:08 +0000 (09:03 +0800)]
Merge branch 'MDL-58713-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 16 Oct 2017 22:37:47 +0000 (00:37 +0200)]
Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-60365-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 16 Oct 2017 22:23:38 +0000 (00:23 +0200)]
Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-60171' of https://github.com/cbluesprl/moodle
Eloy Lafuente (stronk7) [Mon, 16 Oct 2017 22:13:25 +0000 (00:13 +0200)]
Merge branch 'MDL-60171' of https://github.com/cbluesprl/moodle

4 years agoMerge branch 'MDL-60320' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Mon, 16 Oct 2017 22:05:54 +0000 (00:05 +0200)]
Merge branch 'MDL-60320' of git://github.com/aolley/moodle

4 years agoMerge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 Oct 2017 18:02:03 +0000 (20:02 +0200)]
Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'wip-MDL-60284-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 16 Oct 2017 17:41:36 +0000 (19:41 +0200)]
Merge branch 'wip-MDL-60284-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-57455' of https://github.com/stronk7/moodle
David Monllao [Mon, 16 Oct 2017 17:33:37 +0000 (19:33 +0200)]
Merge branch 'MDL-57455' of https://github.com/stronk7/moodle

4 years agoMDL-57455 mod_data: table aliases cannot use AS for crossdb
Eloy Lafuente (stronk7) [Mon, 16 Oct 2017 17:16:17 +0000 (19:16 +0200)]
MDL-57455 mod_data: table aliases cannot use AS for crossdb

4 years agoMerge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 Oct 2017 16:28:47 +0000 (18:28 +0200)]
Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 16 Oct 2017 16:26:55 +0000 (18:26 +0200)]
Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 16 Oct 2017 11:46:19 +0000 (13:46 +0200)]
Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'wip-MDL-60237-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 16 Oct 2017 10:37:55 +0000 (12:37 +0200)]
Merge branch 'wip-MDL-60237-master' of git://github.com/marinaglancy/moodle