Eloy Lafuente (stronk7) [Mon, 25 Sep 2017 21:07:05 +0000 (23:07 +0200)]
Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 25 Sep 2017 20:06:00 +0000 (22:06 +0200)]
Merge branch 'MDL-60158-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 25 Sep 2017 17:53:48 +0000 (19:53 +0200)]
Merge branch 'wip-MDL-60167-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 25 Sep 2017 03:51:08 +0000 (11:51 +0800)]
MDL-59940 calendar: Fix eslint errors
Andrew Nicols [Tue, 12 Sep 2017 00:33:46 +0000 (08:33 +0800)]
MDL-59940 calendar: Improve event start time default
Create events on the first day of the month when not in the current
month.
Andrew Nicols [Mon, 18 Sep 2017 05:08:43 +0000 (13:08 +0800)]
MDL-60158 calendar: Fix footer options when viewing as guest
Marina Glancy [Thu, 21 Sep 2017 06:28:12 +0000 (14:28 +0800)]
MDL-60167 upgrade: Fix duplicate site registrations
Dan Poltawski [Fri, 22 Sep 2017 11:43:11 +0000 (12:43 +0100)]
weekly release 3.4dev
"Parting is such sweet sorrow."
xxx
Dan Poltawski [Fri, 22 Sep 2017 11:43:10 +0000 (12:43 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jun Pataleta [Fri, 22 Sep 2017 02:54:40 +0000 (10:54 +0800)]
Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle
Dan Poltawski [Thu, 21 Sep 2017 18:03:55 +0000 (19:03 +0100)]
Merge branch 'MDL-53169' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Thu, 21 Sep 2017 17:27:59 +0000 (19:27 +0200)]
MDL-53169 database: use bound empty strings for cross-db
AMOS bot [Thu, 21 Sep 2017 16:07:52 +0000 (00:07 +0800)]
Automatically generated installer lang files
AMOS bot [Thu, 21 Sep 2017 16:07:51 +0000 (00:07 +0800)]
Automatically generated installer lang files
Jake Dallimore [Thu, 21 Sep 2017 11:49:19 +0000 (19:49 +0800)]
MDL-37810 roles: fix profile roles logic to include all roles
If the user has the role:assign capability then the list of profile roles
will include any role assigned in the context or above.
AMOS bot [Wed, 20 Sep 2017 16:05:52 +0000 (00:05 +0800)]
Automatically generated installer lang files
Jun Pataleta [Wed, 20 Sep 2017 10:45:37 +0000 (18:45 +0800)]
Merge branch 'MDL-59750-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)]
Merge branch 'MDL-43176' of https://github.com/NeillM/moodle
Simey Lameze [Wed, 20 Sep 2017 05:25:19 +0000 (13:25 +0800)]
MDL-59750 core_calendar: fix minithree logic on get_view
Simey Lameze [Wed, 20 Sep 2017 01:16:08 +0000 (09:16 +0800)]
MDL-59750 calendar: fix logic on subscription template
Simey Lameze [Tue, 19 Sep 2017 05:19:37 +0000 (13:19 +0800)]
MDL-59750 core_calendar: remove show_day method
Simey Lameze [Mon, 18 Sep 2017 04:08:06 +0000 (12:08 +0800)]
MDL-59750 calendar: organise exporters code
Simey Lameze [Mon, 18 Sep 2017 02:54:32 +0000 (10:54 +0800)]
MDL-59750 calendar: add edit and delete url to exporter
Simey Lameze [Mon, 18 Sep 2017 02:53:26 +0000 (10:53 +0800)]
MDL-59750 calendar: render day view using templates
Simey Lameze [Mon, 4 Sep 2017 07:57:39 +0000 (15:57 +0800)]
MDL-59750 core_calendar: rename template month_header to header
Simey Lameze [Mon, 4 Sep 2017 08:00:43 +0000 (16:00 +0800)]
MDL-59750 core_calendar: add next and previous days handling methods
Simey Lameze [Tue, 12 Sep 2017 02:47:01 +0000 (10:47 +0800)]
MDL-59750 core_calendar: better handling of event subscription
Eloy Lafuente (stronk7) [Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)]
Merge branch 'MDL-43176' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 19 Sep 2017 20:34:39 +0000 (22:34 +0200)]
Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 19 Sep 2017 17:14:18 +0000 (18:14 +0100)]
Merge branch 'MDL-59920-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Tue, 19 Sep 2017 14:26:30 +0000 (22:26 +0800)]
Merge branch 'MDL-53169-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 19 Sep 2017 12:37:47 +0000 (13:37 +0100)]
MDL-57886 plagarism: add note about behaviour change
Dan Poltawski [Tue, 19 Sep 2017 12:40:12 +0000 (13:40 +0100)]
Merge branch 'master_MDL-57886' of https://github.com/danmarsden/moodle
sam marshall [Mon, 21 Aug 2017 16:15:30 +0000 (17:15 +0100)]
MDL-53169 Lib: enrol_get_my_courses can list available courses too
Jun Pataleta [Tue, 19 Sep 2017 09:21:40 +0000 (17:21 +0800)]
Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle
Dan Poltawski [Tue, 19 Sep 2017 08:48:30 +0000 (09:48 +0100)]
Merge branch 'MDL-59277-master' of https://github.com/snake/moodle
Jun Pataleta [Tue, 19 Sep 2017 08:38:08 +0000 (16:38 +0800)]
Merge branch 'MDL-59922-master-on-int' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Tue, 5 Sep 2017 07:46:37 +0000 (07:46 +0000)]
MDL-59922 mod_choice: allow editing of open and close events
Dan Poltawski [Tue, 19 Sep 2017 08:17:47 +0000 (09:17 +0100)]
Merge branch 'MDL-59507-master' of https://github.com/snake/moodle
Dan Poltawski [Tue, 19 Sep 2017 08:10:24 +0000 (09:10 +0100)]
Merge branch 'MDL-59960_mimetype' of https://github.com/mrmark/moodle
Ryan Wyllie [Tue, 5 Sep 2017 07:45:24 +0000 (07:45 +0000)]
MDL-59922 calendar: allow editing of activity events
Dan Poltawski [Tue, 19 Sep 2017 06:27:48 +0000 (07:27 +0100)]
Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 19 Sep 2017 06:16:02 +0000 (07:16 +0100)]
Merge branch 'MDL-60045_master-v2' of git://github.com/markn86/moodle
Jun Pataleta [Tue, 19 Sep 2017 05:38:26 +0000 (13:38 +0800)]
Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 19 Sep 2017 05:03:31 +0000 (13:03 +0800)]
MDL-60065 calendar: Deprecate calendar_get_mini and friends
This is no longer used and should be deprecated.
Mark Nelson [Mon, 11 Sep 2017 04:42:26 +0000 (12:42 +0800)]
MDL-60045 core_user: allow roleid to be passed via URL
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:55:12 +0000 (01:55 +0200)]
Merge branch 'MDL-60105_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:53:07 +0000 (01:53 +0200)]
Merge branch 'MDL-52131-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:50:37 +0000 (01:50 +0200)]
Merge branch 'MDL-60094-master' of https://github.com/abias/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:45:29 +0000 (01:45 +0200)]
Merge branch 'MDL-37810-master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:42:17 +0000 (01:42 +0200)]
Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:36:56 +0000 (01:36 +0200)]
Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 18 Sep 2017 23:33:08 +0000 (01:33 +0200)]
Merge branch 'MDL-59245-master' of git://github.com/jleyva/moodle
Jun Pataleta [Mon, 18 Sep 2017 08:03:46 +0000 (16:03 +0800)]
Merge branch 'MDL-59900_master' of git://github.com/markn86/moodle
Jun Pataleta [Mon, 18 Sep 2017 06:39:46 +0000 (14:39 +0800)]
Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle
Jun Pataleta [Mon, 18 Sep 2017 05:07:45 +0000 (13:07 +0800)]
Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Sun, 10 Sep 2017 05:21:33 +0000 (13:21 +0800)]
MDL-60065 calendar: Add threemonth view
Andrew Nicols [Sun, 10 Sep 2017 05:20:40 +0000 (13:20 +0800)]
MDL-60065 calendar: Specify optional replacement node
Andrew Nicols [Sat, 9 Sep 2017 09:16:32 +0000 (17:16 +0800)]
MDL-60065 calendar: Control navigation on mini
Andrew Nicols [Sat, 9 Sep 2017 09:15:17 +0000 (17:15 +0800)]
MDL-60065 calendar: Update side calendar when on CRUD events
Jun Pataleta [Mon, 18 Sep 2017 03:49:30 +0000 (11:49 +0800)]
Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 12 Sep 2017 07:46:18 +0000 (15:46 +0800)]
MDL-59920 calendar: Allow user to choose if deleting one or all events
Andrew Nicols [Thu, 14 Sep 2017 03:05:17 +0000 (11:05 +0800)]
MDL-60125 calendar: Switch to navigation by YMD
Jake Dallimore [Thu, 14 Sep 2017 07:23:04 +0000 (15:23 +0800)]
MDL-37810 roles: added manager case to test_get_user_roles_in_course()
Managers can assign managers, and should be able to see that role on
the course profile page, as a link to the participants page.
Jun Pataleta [Mon, 18 Sep 2017 01:10:35 +0000 (09:10 +0800)]
Merge branch 'MDL-59994-master-v2' of git://github.com/lameze/moodle
Jake Dallimore [Mon, 19 Jun 2017 07:17:48 +0000 (15:17 +0800)]
MDL-59277 navigation: add support for container type in get_css_type()
Jake Dallimore [Tue, 12 Sep 2017 00:55:32 +0000 (08:55 +0800)]
MDL-59507 forms: unit tests confirming that .xxx is an invalid extension
Modified:
- test_data_for_browser()
- test_unknow_file_types()
Jake Dallimore [Tue, 12 Sep 2017 00:32:45 +0000 (08:32 +0800)]
MDL-59507 forms: accepted file types won't allow the .xxx extension
- Modified get_filetypes_browser_data() to exclude this extension.
- Server side form validation blocks this extension too.
Jake Dallimore [Thu, 14 Sep 2017 06:10:48 +0000 (14:10 +0800)]
MDL-37810 roles: get_user_roles_in_course returns all relevant roles
Fixed to return both those roles in the profileroles site policy and
any roles which the current user can assign in the respective context,
meaning a user can see a link to any role they can assign.
Jake Dallimore [Mon, 11 Sep 2017 03:31:00 +0000 (11:31 +0800)]
MDL-37810 core_user: fix the user renderer's usage of get_profile_roles
Jake Dallimore [Mon, 11 Sep 2017 03:52:23 +0000 (11:52 +0800)]
MDL-37810 roles: unit tests for get_profile_roles()
Jake Dallimore [Mon, 11 Sep 2017 03:19:03 +0000 (11:19 +0800)]
MDL-37810 roles: fix get_profile_roles() so it returns assignable roles
Simey Lameze [Thu, 14 Sep 2017 02:02:54 +0000 (10:02 +0800)]
MDL-59994 competency: improve user competency unit test
Simey Lameze [Thu, 14 Sep 2017 02:02:39 +0000 (10:02 +0800)]
MDL-59994 competency: dont list competencies from deleted users
Neill Magill [Tue, 15 Aug 2017 14:49:53 +0000 (15:49 +0100)]
MDL-43176 enrol_meta: enrol_meta_sync query is inefficient
Before this change the nested select did a full table scan of
either the enrol or user_enrolments table. This meant that
on large sites the query could be very slow.
This change ensures that there are no full table scans which
makes the query much more efficient.
In my testing the all courses version of the query changed
from ~15 s to ~ 5 s; the singles course version changed
from ~15 s to > 0.1 s
Dan Poltawski [Fri, 15 Sep 2017 07:49:23 +0000 (08:49 +0100)]
weekly release 3.4dev
Dan Poltawski [Fri, 15 Sep 2017 07:49:21 +0000 (08:49 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Alexander Bias [Tue, 12 Sep 2017 06:01:03 +0000 (08:01 +0200)]
MDL-60094 administration: Add CLI script to kill all sessions
Dan Poltawski [Thu, 14 Sep 2017 11:25:47 +0000 (12:25 +0100)]
Merge branch 'MDL-58835_master-fix2' of https://github.com/dmonllao/moodle
David Monllao [Thu, 14 Sep 2017 10:55:03 +0000 (12:55 +0200)]
MDL-58835 report_insights: Force window reload when no more predictions
Juan Leyva [Thu, 14 Sep 2017 10:17:21 +0000 (12:17 +0200)]
MDL-60132 tool_mobile: Handle correctly moodle_url instances
In Moodle there are some functions that can be overridden by themes.
Some themes are returning incorrect value types in those functions
Juan Segarra Montesinos [Sat, 14 Nov 2015 08:54:11 +0000 (09:54 +0100)]
MDL-52131 qbehaviour: respect manualcomment format
The format of a manual comment in a question is respected when
the preferred editor is "Plain text area".
Jun Pataleta [Thu, 14 Sep 2017 04:17:14 +0000 (12:17 +0800)]
Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Sep 2017 04:05:12 +0000 (12:05 +0800)]
MDL-59775 forms: css correction
Dan Marsden [Mon, 14 Aug 2017 23:11:24 +0000 (11:11 +1200)]
MDL-57886 plagiarism: Pass raw unformatted content to get_links.
Jun Pataleta [Thu, 14 Sep 2017 01:47:22 +0000 (09:47 +0800)]
Merge branch 'MDL-59926' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 13 Sep 2017 23:26:30 +0000 (01:26 +0200)]
MDL-59926 behat: Make the search bootstrapbase + boost compatible
By combining the title attribute search with the "icon" class instead
of old "img" or new "i" elements we achieve that without too much
complication.
Matt Clarkson [Wed, 13 Sep 2017 00:40:53 +0000 (12:40 +1200)]
MDL-60105 mod_folder: Set timemodified on change
Changes to the folder contents were not resulting in the
timemodied of the folder activity being set. This prevented
global search from picking up the changes.
Matt Clarkson [Wed, 13 Sep 2017 00:50:29 +0000 (12:50 +1200)]
MDL-60105 search: Fix fatal error
If an indexed file has been modified or deleted the search index
will still reference the old file. Remove the file from search
results until the change has been indexed.
Eloy Lafuente (stronk7) [Wed, 13 Sep 2017 10:09:52 +0000 (12:09 +0200)]
Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 13 Sep 2017 09:41:28 +0000 (11:41 +0200)]
MDL-59243 mod_workshop: Return creation status in create_submission WS
Dan Poltawski [Wed, 13 Sep 2017 08:04:39 +0000 (09:04 +0100)]
Merge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Wed, 13 Sep 2017 07:49:14 +0000 (09:49 +0200)]
MDL-58835 report_insights: Fix redirections
Mark Nelson [Mon, 11 Sep 2017 08:37:08 +0000 (16:37 +0800)]
MDL-59900 core_admin: moved analytic links to their own category
AMOS bot [Tue, 12 Sep 2017 16:06:29 +0000 (00:06 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 12 Sep 2017 14:28:26 +0000 (15:28 +0100)]
Merge branch 'MDL-59084-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 30 May 2017 02:24:06 +0000 (10:24 +0800)]
MDL-59084 core: Allow adhoc tasks to run as a specified user
Dan Poltawski [Tue, 12 Sep 2017 10:26:18 +0000 (11:26 +0100)]
Merge branch 'MDL-60039_master' of git://github.com/dmonllao/moodle
David Monllao [Wed, 6 Sep 2017 12:00:56 +0000 (14:00 +0200)]
MDL-60039 search: Force messaging search areas to be reindexed
Dan Poltawski [Tue, 12 Sep 2017 09:54:11 +0000 (10:54 +0100)]
Merge branch 'MDL-59929' of git://github.com/timhunt/moodle