moodle.git
3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Wed, 8 Nov 2017 08:47:38 +0000 (09:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 8 Nov 2017 07:46:44 +0000 (15:46 +0800)]
Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60590 enrol_manual: Fix for race condition in button calculation
Andrew Nicols [Wed, 8 Nov 2017 07:15:17 +0000 (15:15 +0800)]
MDL-60590 enrol_manual: Fix for race condition in button calculation

3 years agoMerge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)]
Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle

3 years agoMDL-60700 calendar: Update behat test or new normal
Andrew Nicols [Wed, 8 Nov 2017 02:10:29 +0000 (10:10 +0800)]
MDL-60700 calendar: Update behat test or new normal

3 years agoMerge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Wed, 8 Nov 2017 01:43:15 +0000 (14:43 +1300)]
Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle

3 years agoAutomatically generated installer lang files
AMOS bot [Wed, 8 Nov 2017 00:05:03 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMDL-60717 lang: Reflect the string change in behat scenario file
David Mudrák [Tue, 7 Nov 2017 20:49:18 +0000 (21:49 +0100)]
MDL-60717 lang: Reflect the string change in behat scenario file

3 years agoMDL-60717 lang: Merge English strings from the en_fix language pack
Helen Foster [Tue, 7 Nov 2017 20:29:50 +0000 (21:29 +0100)]
MDL-60717 lang: Merge English strings from the en_fix language pack

Significant string changes:

- needbcmath,auth_ldap - 'grace logins' changed to 'expired password
  checking'

3 years agoMerge branch 'MDL-59758_notes-fix' of git://github.com/dmonllao/moodle
David Monllao [Tue, 7 Nov 2017 13:01:35 +0000 (14:01 +0100)]
Merge branch 'MDL-59758_notes-fix' of git://github.com/dmonllao/moodle

3 years agoMDL-59758 user: Notes publish state adapted to ws
David Monllao [Tue, 7 Nov 2017 12:53:21 +0000 (13:53 +0100)]
MDL-59758 user: Notes publish state adapted to ws

3 years agoMerge branch 'MDL-59758-master' of git://github.com/damyon/moodle
David Monllao [Tue, 7 Nov 2017 11:37:30 +0000 (12:37 +0100)]
Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle
Jake Dallimore [Tue, 7 Nov 2017 08:03:43 +0000 (16:03 +0800)]
Merge branch 'MDL-59256_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle
Jake Dallimore [Tue, 7 Nov 2017 07:44:12 +0000 (15:44 +0800)]
Merge branch 'MDL-60700-int-fix-1' of github.com:ryanwyllie/moodle

3 years agoMDL-60700 clean: add course link to activity event summary modal
Ryan Wyllie [Tue, 7 Nov 2017 07:36:49 +0000 (07:36 +0000)]
MDL-60700 clean: add course link to activity event summary modal

3 years agoMDL-59256 analytics: Respect activities specific access conditions
David Monllao [Fri, 27 Oct 2017 15:00:57 +0000 (17:00 +0200)]
MDL-59256 analytics: Respect activities specific access conditions

3 years agoMDL-59256 analytics: Move get_activities method to CoI scope
David Monllao [Fri, 27 Oct 2017 14:58:56 +0000 (16:58 +0200)]
MDL-59256 analytics: Move get_activities method to CoI scope

CoI = community of inquiry model

3 years agoMerge branch 'MDL-57772-master' of git://github.com/damyon/moodle
Jake Dallimore [Tue, 7 Nov 2017 07:01:31 +0000 (15:01 +0800)]
Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle

3 years agoMDL-59758 core_user: Pluralise bulk actions
Damyon Wiese [Tue, 7 Nov 2017 06:35:50 +0000 (14:35 +0800)]
MDL-59758 core_user: Pluralise bulk actions

Don't say 1 people.

3 years agoMerge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle
Jake Dallimore [Tue, 7 Nov 2017 06:23:50 +0000 (14:23 +0800)]
Merge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle

3 years agoMDL-59758 core_user: Clean up user renderer
Damyon Wiese [Tue, 7 Nov 2017 02:33:07 +0000 (10:33 +0800)]
MDL-59758 core_user: Clean up user renderer

These functions are not used anywhere by anything.

3 years agoMDL-59758 core_user: Replace old bulk actions
Damyon Wiese [Tue, 7 Nov 2017 02:32:51 +0000 (10:32 +0800)]
MDL-59758 core_user: Replace old bulk actions

The participants page has some clunky multi page forms for bulk actions. Replaces it with an ajax alternative.

3 years agoMDL-60700 calendar: remove bottom margin for description in summary
Ryan Wyllie [Tue, 7 Nov 2017 06:03:01 +0000 (06:03 +0000)]
MDL-60700 calendar: remove bottom margin for description in summary

3 years agoMerge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 7 Nov 2017 05:49:47 +0000 (13:49 +0800)]
Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle

3 years agoMDL-60062 calendar: prevent drag and drop of override events
Ryan Wyllie [Tue, 7 Nov 2017 05:47:18 +0000 (05:47 +0000)]
MDL-60062 calendar: prevent drag and drop of override events

3 years agoMerge branch 'MDL-60686-master' of git://github.com/damyon/moodle
Jake Dallimore [Tue, 7 Nov 2017 05:39:33 +0000 (13:39 +0800)]
Merge branch 'MDL-60686-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle
Damyon Wiese [Tue, 7 Nov 2017 03:59:49 +0000 (11:59 +0800)]
Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle

3 years agoMDL-57772 chat: BEEP is back baby!
Damyon Wiese [Mon, 6 Nov 2017 07:08:55 +0000 (15:08 +0800)]
MDL-57772 chat: BEEP is back baby!

3 years agoMDL-60590 core_enrol: fixed failing Behat scenarios
Mark Nelson [Tue, 7 Nov 2017 03:24:34 +0000 (11:24 +0800)]
MDL-60590 core_enrol: fixed failing Behat scenarios

3 years agoMerge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 7 Nov 2017 03:05:43 +0000 (11:05 +0800)]
Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-60705-master' of https://github.com/sammarshallou/moodle
Jake Dallimore [Tue, 7 Nov 2017 02:50:53 +0000 (10:50 +0800)]
Merge branch 'MDL-60705-master' of https://github.com/sammarshallou/moodle

3 years agoMDL-59758 js: auto_rows module easier to use
Damyon Wiese [Fri, 8 Sep 2017 06:51:31 +0000 (14:51 +0800)]
MDL-59758 js: auto_rows module easier to use

Allow passing the direct text area, or a container.
Trigger change events on the text area, not the container.
Properly handle starting with rows > 1

3 years agoMDL-60686 core_users: Reorder filters by utility
Damyon Wiese [Mon, 6 Nov 2017 03:38:51 +0000 (11:38 +0800)]
MDL-60686 core_users: Reorder filters by utility

Order the list of filters on the participant page from most useful to least useful.

3 years agoMDL-60700 calendar: normalise event type in summmary modal render
Ryan Wyllie [Mon, 6 Nov 2017 06:54:25 +0000 (06:54 +0000)]
MDL-60700 calendar: normalise event type in summmary modal render

3 years agoMerge branch 'wip-MDL-60391-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Tue, 7 Nov 2017 01:30:58 +0000 (14:30 +1300)]
Merge branch 'wip-MDL-60391-master' of git://github.com/marinaglancy/moodle

3 years agoMDL-60062 calendar: remove validate_event_timestart callback
Ryan Wyllie [Mon, 30 Oct 2017 08:15:10 +0000 (08:15 +0000)]
MDL-60062 calendar: remove validate_event_timestart callback

3 years agoMDL-60062 quiz: add support for drag drop of calendar events
Ryan Wyllie [Thu, 5 Oct 2017 08:07:07 +0000 (08:07 +0000)]
MDL-60062 quiz: add support for drag drop of calendar events

3 years agoMerge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Tue, 7 Nov 2017 00:37:52 +0000 (13:37 +1300)]
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60361 calendar: Update behat test lang
Andrew Nicols [Tue, 7 Nov 2017 00:36:29 +0000 (08:36 +0800)]
MDL-60361 calendar: Update behat test lang

3 years agoMerge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 6 Nov 2017 22:31:45 +0000 (11:31 +1300)]
Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle

3 years agoMDL-60611 calendar: Remove usage of deprecated setExpectedException()
Jun Pataleta [Mon, 6 Nov 2017 22:21:29 +0000 (11:21 +1300)]
MDL-60611 calendar: Remove usage of deprecated setExpectedException()

3 years agoMerge branch 'MDL-60611' of git://github.com/stronk7/moodle
Jun Pataleta [Mon, 6 Nov 2017 21:14:24 +0000 (10:14 +1300)]
Merge branch 'MDL-60611' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-60638-master' of git://github.com/lameze/moodle
David Monllao [Mon, 6 Nov 2017 20:45:14 +0000 (21:45 +0100)]
Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle

3 years agoMDL-60671 core_search: Cron output should use mtrace
sam marshall [Mon, 6 Nov 2017 11:55:29 +0000 (11:55 +0000)]
MDL-60671 core_search: Cron output should use mtrace

The mtrace function is preferable for plain text logging/progress
output because it can be redirected if necessary. By convention it
is normally used in cron and can be used in CLI tasks if required.

This change makes the text_progress_trace class use mtrace instead
of echo and then flush. (Default behaviour of mtrace is to do
exactly that, but it can be redirected too.)

Before this change, if anybody is relying on mtrace behaviour to
redirect logs of cron output, this will fail for some parts of the
search cron output (and some other places like auth plugins).

3 years agoMDL-60705 core_search: Unit tests get time wrong by factor 1 million
sam marshall [Mon, 6 Nov 2017 11:50:43 +0000 (11:50 +0000)]
MDL-60705 core_search: Unit tests get time wrong by factor 1 million

3 years agoMerge branch 'MDL-60590_master' of git://github.com/markn86/moodle
Damyon Wiese [Mon, 6 Nov 2017 06:18:40 +0000 (14:18 +0800)]
Merge branch 'MDL-60590_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 6 Nov 2017 05:27:11 +0000 (13:27 +0800)]
Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60626-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 6 Nov 2017 04:43:24 +0000 (12:43 +0800)]
Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle

3 years agoMDL-60590 core_user: added Behat test for cohort list presence
Mark Nelson [Thu, 2 Nov 2017 06:59:07 +0000 (14:59 +0800)]
MDL-60590 core_user: added Behat test for cohort list presence

3 years agoMDL-60590 core_cohort: removed unused variables from search_cohorts()
Mark Nelson [Thu, 2 Nov 2017 06:58:39 +0000 (14:58 +0800)]
MDL-60590 core_cohort: removed unused variables from search_cohorts()

3 years agoMDL-60590 enrol_manual: button title depends on cohort list existence
Mark Nelson [Wed, 1 Nov 2017 10:28:47 +0000 (18:28 +0800)]
MDL-60590 enrol_manual: button title depends on cohort list existence

Also added a SELECTORS object to tidy the code by keeping the
selectors in a central location.

3 years agoMDL-60590 enrol_manual: check cohorts exist before displaying select
Mark Nelson [Wed, 1 Nov 2017 11:03:47 +0000 (19:03 +0800)]
MDL-60590 enrol_manual: check cohorts exist before displaying select

3 years agoMDL-60626 calendar: Fix for overrides
Damyon Wiese [Mon, 6 Nov 2017 04:21:27 +0000 (12:21 +0800)]
MDL-60626 calendar: Fix for overrides

Override events do not have the courseid so we need to get it from the module instance.

3 years agoMDL-60590 enrol_manual: only show cohorts with necessary capabilities
Mark Nelson [Tue, 31 Oct 2017 09:23:17 +0000 (17:23 +0800)]
MDL-60590 enrol_manual: only show cohorts with necessary capabilities

3 years agoMDL-60626 calendar: Unit tests for capabilities
Damyon Wiese [Tue, 31 Oct 2017 03:27:27 +0000 (11:27 +0800)]
MDL-60626 calendar: Unit tests for capabilities

Check various calendar external functions for capabilities.

3 years agoMDL-60626 calendar: Check capabilities for api
Damyon Wiese [Tue, 31 Oct 2017 03:25:48 +0000 (11:25 +0800)]
MDL-60626 calendar: Check capabilities for api

All external functions must check all capabilities before returning data.
The calendar API itself does not check capabilities (I wish it did), so we must be
careful exposing these functions to webservices.

3 years agoMerge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle
Damyon Wiese [Mon, 6 Nov 2017 02:45:34 +0000 (10:45 +0800)]
Merge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-60596_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 6 Nov 2017 02:19:10 +0000 (10:19 +0800)]
Merge branch 'MDL-60596_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60437-multilang-html-block-titles' of https://github.com/lucaboesch...
Damyon Wiese [Mon, 6 Nov 2017 02:09:08 +0000 (10:09 +0800)]
Merge branch 'MDL-60437-multilang-html-block-titles' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Mon, 6 Nov 2017 01:29:46 +0000 (09:29 +0800)]
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-59858 amd: Focus on the element that actually triggers the modal
Jun Pataleta [Tue, 3 Oct 2017 05:58:46 +0000 (13:58 +0800)]
MDL-59858 amd: Focus on the element that actually triggers the modal

3 years agoMerge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Sun, 5 Nov 2017 21:18:46 +0000 (10:18 +1300)]
Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle

3 years agoMDL-60611 phpunit: remove deprecated stuff and other minor fixes
Eloy Lafuente (stronk7) [Thu, 2 Nov 2017 21:03:54 +0000 (22:03 +0100)]
MDL-60611 phpunit: remove deprecated stuff and other minor fixes

Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons

3 years agoAutomatically generated installer lang files
AMOS bot [Sun, 5 Nov 2017 00:05:09 +0000 (00:05 +0000)]
Automatically generated installer lang files

3 years agoMDL-60437 blocks: HTML block title multilang
Luca Bösch [Mon, 9 Oct 2017 23:04:39 +0000 (01:04 +0200)]
MDL-60437 blocks: HTML block title multilang

3 years agoMDL-60598 analytics: Info message for predictions based on data
David Monllao [Mon, 30 Oct 2017 15:44:01 +0000 (16:44 +0100)]
MDL-60598 analytics: Info message for predictions based on data

3 years agoMDL-60596 analytics: Check cm completion if available
David Monllao [Fri, 20 Oct 2017 09:16:53 +0000 (11:16 +0200)]
MDL-60596 analytics: Check cm completion if available

Previous code was restricted to course modules origin.

3 years agoMDL-60667 mlbackend_python: Bump to non-linear neural net version
David Monllao [Thu, 2 Nov 2017 15:03:39 +0000 (16:03 +0100)]
MDL-60667 mlbackend_python: Bump to non-linear neural net version

3 years agoMDL-59256 analytics: Move get_activities test scope
David Monllao [Fri, 27 Oct 2017 14:58:25 +0000 (16:58 +0200)]
MDL-59256 analytics: Move get_activities test scope

3 years agoMoodle release 3.4rc1 v3.4.0-rc1
David Monllao [Fri, 3 Nov 2017 09:26:18 +0000 (10:26 +0100)]
Moodle release 3.4rc1

3 years agoMerge branch 'MDL-58047-master-fix1' of http://github.com/damyon/moodle
Jake Dallimore [Fri, 3 Nov 2017 08:09:29 +0000 (16:09 +0800)]
Merge branch 'MDL-58047-master-fix1' of github.com/damyon/moodle

3 years agoMDL-58047 assign: submission sorting
Damyon Wiese [Fri, 3 Nov 2017 07:36:22 +0000 (15:36 +0800)]
MDL-58047 assign: submission sorting

Only exclude new submission records from the sorting, draft and reopened submission are valid.

3 years agoMerge branch 'MDL-60657-int-fix-1' of github.com:ryanwyllie/moodle
Jun Pataleta [Fri, 3 Nov 2017 03:51:24 +0000 (16:51 +1300)]
Merge branch 'MDL-60657-int-fix-1' of github.com:ryanwyllie/moodle

3 years agoMDL-60361 calendar: Support all event types for calendar subs
Andrew Nicols [Fri, 6 Oct 2017 01:05:41 +0000 (09:05 +0800)]
MDL-60361 calendar: Support all event types for calendar subs

3 years agoMDL-60657 boost: fix styles when extending modal components
Ryan Wyllie [Fri, 3 Nov 2017 03:18:02 +0000 (03:18 +0000)]
MDL-60657 boost: fix styles when extending modal components

I've wrapped the custom modal styling in the .modal class. This prevents
those custom styles from being pulled in when the SCSS @extend
functionality is used to extend the modal components.

3 years agoMDL-60638 calendar: fix event subscription variable names
Simey Lameze [Fri, 3 Nov 2017 01:08:08 +0000 (09:08 +0800)]
MDL-60638 calendar: fix event subscription variable names

3 years agoMerge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
Jake Dallimore [Fri, 3 Nov 2017 01:14:52 +0000 (09:14 +0800)]
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle

3 years agoMDL-60587 calendar: Adjust use of time() in unit tests
Andrew Nicols [Fri, 3 Nov 2017 01:04:10 +0000 (09:04 +0800)]
MDL-60587 calendar: Adjust use of time() in unit tests

3 years agoMerge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
Jake Dallimore [Fri, 3 Nov 2017 00:37:31 +0000 (08:37 +0800)]
Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle

3 years agoMDL-60587 block: Correct courseid/categoryid check
Andrew Nicols [Fri, 3 Nov 2017 00:14:54 +0000 (08:14 +0800)]
MDL-60587 block: Correct courseid/categoryid check

pagelib uses magic getters for both the course, and category.
It does not define the magic __isset function though.

3 years agoMDL-60611 phpunit: ignore risky (empty) unit tests
Eloy Lafuente (stronk7) [Thu, 2 Nov 2017 21:01:43 +0000 (22:01 +0100)]
MDL-60611 phpunit: ignore risky (empty) unit tests

At some point we should review them, removing or moving stuff.

3 years agoMDL-60611 phpunit: switch to namespaced phunit classes
Eloy Lafuente (stronk7) [Thu, 2 Nov 2017 18:48:06 +0000 (19:48 +0100)]
MDL-60611 phpunit: switch to namespaced phunit classes

3 years agoMDL-60611 phpunit: Bump phpunit to 6.4 and travis to use PHP72
Eloy Lafuente (stronk7) [Thu, 2 Nov 2017 18:43:29 +0000 (19:43 +0100)]
MDL-60611 phpunit: Bump phpunit to 6.4 and travis to use PHP72

3 years agoMerge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle
David Monllao [Thu, 2 Nov 2017 15:57:03 +0000 (16:57 +0100)]
Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle

3 years agoMerge branch 'MDL-51945-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 2 Nov 2017 15:54:34 +0000 (16:54 +0100)]
Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle

3 years agoMDL-60587 calendar: Fix un-validated params
Andrew Nicols [Thu, 2 Nov 2017 11:00:53 +0000 (19:00 +0800)]
MDL-60587 calendar: Fix un-validated params

3 years agoMDL-60587 calendar: Improve link params for calendar buttons
Andrew Nicols [Fri, 27 Oct 2017 02:28:07 +0000 (10:28 +0800)]
MDL-60587 calendar: Improve link params for calendar buttons

3 years agoMDL-60587 calendar: Switch WS to use new helper
Andrew Nicols [Fri, 27 Oct 2017 02:29:29 +0000 (10:29 +0800)]
MDL-60587 calendar: Switch WS to use new helper

3 years agoMDL-60587 calendar: Add missing categoryid in upcoming WS
Andrew Nicols [Fri, 27 Oct 2017 02:29:12 +0000 (10:29 +0800)]
MDL-60587 calendar: Add missing categoryid in upcoming WS

3 years agoMDL-60587 calendar: Switch to new helper in main view
Andrew Nicols [Fri, 27 Oct 2017 02:27:03 +0000 (10:27 +0800)]
MDL-60587 calendar: Switch to new helper in main view

3 years agoMDL-60587 block_calendar_upcoming: Setup calendar using new helper
Andrew Nicols [Fri, 27 Oct 2017 02:26:20 +0000 (10:26 +0800)]
MDL-60587 block_calendar_upcoming: Setup calendar using new helper

3 years agoMDL-60587 block_calendar_month: Setup calendar using new helper
Andrew Nicols [Fri, 27 Oct 2017 02:25:56 +0000 (10:25 +0800)]
MDL-60587 block_calendar_month: Setup calendar using new helper

3 years agoMDL-60587 calendar: Correct category subscription in information
Andrew Nicols [Fri, 27 Oct 2017 02:25:20 +0000 (10:25 +0800)]
MDL-60587 calendar: Correct category subscription in information

3 years agoMDL-60587 calendar: Add helper to setup the calendar_information
Andrew Nicols [Fri, 27 Oct 2017 02:24:51 +0000 (10:24 +0800)]
MDL-60587 calendar: Add helper to setup the calendar_information

3 years agoMerge branch 'MDL-60634-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 2 Nov 2017 12:24:58 +0000 (13:24 +0100)]
Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Thu, 2 Nov 2017 11:45:22 +0000 (12:45 +0100)]
Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 2 Nov 2017 11:04:07 +0000 (12:04 +0100)]
Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 2 Nov 2017 10:59:30 +0000 (11:59 +0100)]
Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle

3 years agoMerge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 2 Nov 2017 07:46:42 +0000 (15:46 +0800)]
Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60558 block_calendar_upcoming: Render the template when no events
Andrew Nicols [Thu, 2 Nov 2017 07:43:17 +0000 (15:43 +0800)]
MDL-60558 block_calendar_upcoming: Render the template when no events