moodle.git
4 years agoAutomatically generated installer lang files
AMOS bot [Thu, 21 Sep 2017 16:07:51 +0000 (00:07 +0800)]
Automatically generated installer lang files

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 20 Sep 2017 16:05:52 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoweekly release 3.4dev
Dan Poltawski [Fri, 15 Sep 2017 07:49:23 +0000 (08:49 +0100)]
weekly release 3.4dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

4 years agoMerge branch 'MDL-58835_master-fix2' of https://github.com/dmonllao/moodle
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

4 years agoMDL-58835 report_insights: Force window reload when no more predictions
David Monllao [Thu, 14 Sep 2017 10:55:03 +0000 (12:55 +0200)]
MDL-58835 report_insights: Force window reload when no more predictions

4 years agoMerge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle
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

4 years agoMDL-59775 forms: css correction
Marina Glancy [Thu, 14 Sep 2017 04:05:12 +0000 (12:05 +0800)]
MDL-59775 forms: css correction

4 years agoMerge branch 'MDL-59926' of https://github.com/stronk7/moodle
Jun Pataleta [Thu, 14 Sep 2017 01:47:22 +0000 (09:47 +0800)]
Merge branch 'MDL-59926' of https://github.com/stronk7/moodle

4 years agoMDL-59926 behat: Make the search bootstrapbase + boost compatible
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.

4 years agoMerge branch 'MDL-59243-master' of git://github.com/jleyva/moodle
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

4 years agoMDL-59243 mod_workshop: Return creation status in create_submission WS
Juan Leyva [Wed, 13 Sep 2017 09:41:28 +0000 (11:41 +0200)]
MDL-59243 mod_workshop: Return creation status in create_submission WS

4 years agoMerge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle
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

4 years agoMDL-58835 report_insights: Fix redirections
David Monllao [Wed, 13 Sep 2017 07:49:14 +0000 (09:49 +0200)]
MDL-58835 report_insights: Fix redirections

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 12 Sep 2017 16:06:29 +0000 (00:06 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-59084-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 12 Sep 2017 14:28:26 +0000 (15:28 +0100)]
Merge branch 'MDL-59084-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-59084 core: Allow adhoc tasks to run as a specified user
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

4 years agoMerge branch 'MDL-60039_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 12 Sep 2017 10:26:18 +0000 (11:26 +0100)]
Merge branch 'MDL-60039_master' of git://github.com/dmonllao/moodle

4 years agoMDL-60039 search: Force messaging search areas to be reindexed
David Monllao [Wed, 6 Sep 2017 12:00:56 +0000 (14:00 +0200)]
MDL-60039 search: Force messaging search areas to be reindexed

4 years agoMerge branch 'MDL-59929' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 12 Sep 2017 09:54:11 +0000 (10:54 +0100)]
Merge branch 'MDL-59929' of git://github.com/timhunt/moodle

4 years agoMerge branch 'wip-MDL-59775-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 12 Sep 2017 09:44:47 +0000 (11:44 +0200)]
Merge branch 'wip-MDL-59775-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-58835_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 12 Sep 2017 08:44:56 +0000 (09:44 +0100)]
Merge branch 'MDL-58835_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 12 Sep 2017 08:41:17 +0000 (10:41 +0200)]
Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57407-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 12 Sep 2017 08:33:30 +0000 (10:33 +0200)]
Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-59243-master' of git://github.com/jleyva/moodle
Jun Pataleta [Tue, 12 Sep 2017 08:29:43 +0000 (16:29 +0800)]
Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle

4 years agoMDL-59761 eslint: update to v4.6.1
Dan Poltawski [Tue, 12 Sep 2017 08:23:46 +0000 (09:23 +0100)]
MDL-59761 eslint: update to v4.6.1

The new versions got released while this issue was waiting for peer
review.

4 years agoMerge branch 'MDL-60086-master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 12 Sep 2017 07:56:23 +0000 (09:56 +0200)]
Merge branch 'MDL-60086-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-59919-master' of git://github.com/ryanwyllie/moodle
Jun Pataleta [Tue, 12 Sep 2017 06:58:06 +0000 (14:58 +0800)]
Merge branch 'MDL-59919-master' of git://github.com/ryanwyllie/moodle

4 years agoMerge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 12 Sep 2017 06:12:26 +0000 (08:12 +0200)]
Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle

4 years agoMerge branch 'MDL-59831_master' of git://github.com/markn86/moodle
David Monllao [Tue, 12 Sep 2017 06:07:52 +0000 (08:07 +0200)]
Merge branch 'MDL-59831_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-59867-master' of git://github.com/damyon/moodle
David Monllao [Tue, 12 Sep 2017 05:10:46 +0000 (07:10 +0200)]
Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-59879-master' of https://github.com/abias/moodle
David Monllao [Tue, 12 Sep 2017 05:04:34 +0000 (07:04 +0200)]
Merge branch 'MDL-59879-master' of https://github.com/abias/moodle

4 years agoMDL-60086 travis: Bumping the postgres version to 9.6
Jake Dallimore [Tue, 12 Sep 2017 01:33:52 +0000 (09:33 +0800)]
MDL-60086 travis: Bumping the postgres version to 9.6

3.2 was bumped to 9.6, this makes the change across the board.

4 years agoMerge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Tue, 12 Sep 2017 00:55:47 +0000 (08:55 +0800)]
Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-59392 calendar: Remove bad behat tag
Andrew Nicols [Tue, 12 Sep 2017 00:34:40 +0000 (08:34 +0800)]
MDL-59392 calendar: Remove bad behat tag

4 years agoMerge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 23:43:19 +0000 (01:43 +0200)]
Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-59926-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 22:27:49 +0000 (00:27 +0200)]
Merge branch 'MDL-59926-master' of https://github.com/sammarshallou/moodle

4 years agoMerge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 22:21:48 +0000 (00:21 +0200)]
Merge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'wip-MDL-59808-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 22:13:28 +0000 (00:13 +0200)]
Merge branch 'wip-MDL-59808-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60025-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 21:50:36 +0000 (23:50 +0200)]
Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-59934-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Mon, 11 Sep 2017 21:19:48 +0000 (23:19 +0200)]
Merge branch 'MDL-59934-master' of git://github.com/ryanwyllie/moodle

4 years agoAutomatically generated installer lang files
AMOS bot [Mon, 11 Sep 2017 16:08:23 +0000 (00:08 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 11 Sep 2017 13:39:43 +0000 (14:39 +0100)]
Merge branch 'MDL-59392-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 11 Sep 2017 13:18:51 +0000 (14:18 +0100)]
Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattpo...
Dan Poltawski [Mon, 11 Sep 2017 13:01:40 +0000 (14:01 +0100)]
Merge branch 'MDL-59459_Increase_file_indexing_coverage' of https://github.com/mattporritt/moodle

4 years agoMerge branch 'MDL-59977_master' of git://github.com/markn86/moodle
Jun Pataleta [Mon, 11 Sep 2017 09:18:16 +0000 (17:18 +0800)]
Merge branch 'MDL-59977_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Mon, 11 Sep 2017 05:56:56 +0000 (13:56 +0800)]
Merge branch 'MDL-60031-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'wip-MDL-55849-master' of git://github.com/abgreeve/moodle
Jun Pataleta [Mon, 11 Sep 2017 05:26:50 +0000 (13:26 +0800)]
Merge branch 'wip-MDL-55849-master' of git://github.com/abgreeve/moodle

4 years agoMDL-59831 core_user: only set default group when necessary
Mark Nelson [Mon, 28 Aug 2017 09:08:36 +0000 (17:08 +0800)]
MDL-59831 core_user: only set default group when necessary

4 years agoMDL-59831 core_user: show all groups in select when in visible groups
Mark Nelson [Mon, 28 Aug 2017 07:45:10 +0000 (15:45 +0800)]
MDL-59831 core_user: show all groups in select when in visible groups

4 years agoMDL-59392 calendar: Deprecate old event filters
Andrew Nicols [Fri, 8 Sep 2017 05:51:40 +0000 (13:51 +0800)]
MDL-59392 calendar: Deprecate old event filters

4 years agoMDL-59392 calendar: Apply event filters to main calendar view
Andrew Nicols [Fri, 8 Sep 2017 05:45:38 +0000 (13:45 +0800)]
MDL-59392 calendar: Apply event filters to main calendar view

4 years agoMDL-59392 calendar: Switch to templates in the cal block
Andrew Nicols [Fri, 1 Sep 2017 06:58:14 +0000 (14:58 +0800)]
MDL-59392 calendar: Switch to templates in the cal block

This commit adds a set of templates for the calendar month block, and
the events filter. The same data exporters used in the main calendar
view are utilised and the same logic.

Some additional data was added to the exporters, and in the long term
this will be used in the main monthly view so I did not feel it was
prudent to strip it out into a different view of the model.

AMOS BEGIN
 MOV [monthnext,access],[monthnext,calendar]
AMOS END

4 years agoMDL-59977 core: do not directly check 'viewparticipant' capability
Mark Nelson [Wed, 30 Aug 2017 07:11:20 +0000 (15:11 +0800)]
MDL-59977 core: do not directly check 'viewparticipant' capability

4 years agoMerge branch 'MDL-35668-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 11 Sep 2017 03:34:00 +0000 (11:34 +0800)]
Merge branch 'MDL-35668-master-fix' of git://github.com/junpataleta/moodle

4 years agoMDL-35668 phpunit: Add filebrowser test folder to phpunit.xml
Jun Pataleta [Mon, 11 Sep 2017 03:24:51 +0000 (11:24 +0800)]
MDL-35668 phpunit: Add filebrowser test folder to phpunit.xml

4 years agoMerge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Mon, 11 Sep 2017 03:01:41 +0000 (11:01 +0800)]
Merge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-59775 mod_feedback: use vertical forms
Marina Glancy [Thu, 10 Aug 2017 04:51:32 +0000 (12:51 +0800)]
MDL-59775 mod_feedback: use vertical forms

4 years agoMDL-59775 forms: add option to display any form vertical
Marina Glancy [Thu, 10 Aug 2017 04:34:53 +0000 (12:34 +0800)]
MDL-59775 forms: add option to display any form vertical

4 years agoMDL-59775 forms: add femptylabel class to els without labels
Marina Glancy [Wed, 9 Aug 2017 07:01:38 +0000 (15:01 +0800)]
MDL-59775 forms: add femptylabel class to els without labels

This class was present in clean/more but was forgotted in boost

4 years agoMDL-59392 calendar: Stop polluting history with useless URLs
Andrew Nicols [Fri, 8 Sep 2017 00:53:24 +0000 (08:53 +0800)]
MDL-59392 calendar: Stop polluting history with useless URLs

4 years agoMDL-59392 calendar: Correct the next period (add vs sub)
Andrew Nicols [Tue, 5 Sep 2017 07:22:18 +0000 (15:22 +0800)]
MDL-59392 calendar: Correct the next period (add vs sub)

4 years agoMDL-59392 calendar: Add the calendar info to the exporter
Andrew Nicols [Tue, 5 Sep 2017 07:17:50 +0000 (15:17 +0800)]
MDL-59392 calendar: Add the calendar info to the exporter

4 years agoMDL-59392 calendar: Split day exporter to week exporter
Andrew Nicols [Mon, 11 Sep 2017 01:57:54 +0000 (09:57 +0800)]
MDL-59392 calendar: Split day exporter to week exporter

4 years agoMDL-59392 calendar: Move template to parent Node
Andrew Nicols [Tue, 5 Sep 2017 07:14:54 +0000 (15:14 +0800)]
MDL-59392 calendar: Move template to parent Node

4 years agoMDL-59392 calendar: ViewManager should take a root
Andrew Nicols [Tue, 5 Sep 2017 07:14:00 +0000 (15:14 +0800)]
MDL-59392 calendar: ViewManager should take a root

4 years agoMDL-57407 mod_glossary: Return ratings in external functions
Juan Leyva [Fri, 14 Jul 2017 16:52:16 +0000 (17:52 +0100)]
MDL-57407 mod_glossary: Return ratings in external functions

4 years agoMDL-57407 mod_data: Return ratings in mod_data_get_entry
Juan Leyva [Fri, 14 Jul 2017 15:48:18 +0000 (16:48 +0100)]
MDL-57407 mod_data: Return ratings in mod_data_get_entry

4 years agoMDL-57407 mod_forum: Return ratings in external functions
Juan Leyva [Fri, 14 Jul 2017 14:24:24 +0000 (15:24 +0100)]
MDL-57407 mod_forum: Return ratings in external functions

External function get_forum_discussion_posts now returns ratings.

4 years agoMDL-57407 core_rating: Add new external util class for handling ratings
Juan Leyva [Fri, 14 Jul 2017 14:22:31 +0000 (15:22 +0100)]
MDL-57407 core_rating: Add new external util class for handling ratings

This util class handles all the tasks related to retrieve and format
ratings for external functions.

4 years agoMDL-59934 calendar: remove more button from event form modal
Ryan Wyllie [Fri, 8 Sep 2017 02:45:54 +0000 (02:45 +0000)]
MDL-59934 calendar: remove more button from event form modal

4 years agoMDL-58835 analytics: Remove hidden elements from insights list
David Monllao [Wed, 30 Aug 2017 15:16:38 +0000 (17:16 +0200)]
MDL-58835 analytics: Remove hidden elements from insights list

4 years agoMDL-58835 analytics: Unit tests for prediction actions
David Monllao [Mon, 28 Aug 2017 11:24:09 +0000 (13:24 +0200)]
MDL-58835 analytics: Unit tests for prediction actions

4 years agoMDL-58835 report_insights: Not useful and ack prediction actions
David Monllao [Mon, 28 Aug 2017 10:39:32 +0000 (12:39 +0200)]
MDL-58835 report_insights: Not useful and ack prediction actions

4 years agoMDL-58835 analytics: Store prediction actions separately
David Monllao [Mon, 28 Aug 2017 10:36:54 +0000 (12:36 +0200)]
MDL-58835 analytics: Store prediction actions separately

New event for insights viewed as part of this issue.

4 years agoMDL-60039 messaging: global search index using timeread
David Monllao [Wed, 6 Sep 2017 11:50:53 +0000 (13:50 +0200)]
MDL-60039 messaging: global search index using timeread

4 years agoweekly release 3.4dev
David Monllao [Thu, 7 Sep 2017 09:39:02 +0000 (11:39 +0200)]
weekly release 3.4dev

4 years agoMDL-59657 analytics: No predictions until training is completed
David Monllao [Thu, 7 Sep 2017 05:52:56 +0000 (07:52 +0200)]
MDL-59657 analytics: No predictions until training is completed

4 years agoMerge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 6 Sep 2017 13:24:12 +0000 (14:24 +0100)]
Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle

4 years agoMDL-59657 analytics: Move lang string to correct location
David Monllao [Wed, 6 Sep 2017 12:55:34 +0000 (14:55 +0200)]
MDL-59657 analytics: Move lang string to correct location

4 years agoMerge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 6 Sep 2017 11:13:04 +0000 (13:13 +0200)]
Merge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMDL-59759 enrol: Update behat tests for unenrol confirm dialogue
Andrew Nicols [Wed, 6 Sep 2017 05:42:26 +0000 (13:42 +0800)]
MDL-59759 enrol: Update behat tests for unenrol confirm dialogue

4 years agoMDL-59969 admin: Warn admins if a development libs directory exists
David Mudrák [Tue, 29 Aug 2017 17:01:40 +0000 (19:01 +0200)]
MDL-59969 admin: Warn admins if a development libs directory exists

We can't really control the direct web access to directories in dirroot,
that is part of the server setup. So we at least warn admins as they may
not realize the risks of having directories like vendor or node_modules
exposed.

Credit goes to Petr Škoda for mentioning the PHPUnit issue CVE-2017-9841
to me.

4 years agoMDL-59972 mod_feedback: escape subject when showing the contact form
Marina Glancy [Wed, 30 Aug 2017 03:37:27 +0000 (11:37 +0800)]
MDL-59972 mod_feedback: escape subject when showing the contact form

4 years agoMDL-58953 user: additional test case for user_can_view_profile()
Jake Dallimore [Tue, 29 Aug 2017 02:39:11 +0000 (10:39 +0800)]
MDL-58953 user: additional test case for user_can_view_profile()

4 years agoMDL-58953 user: fix course checking logic in user_can_view_profile()
Jake Dallimore [Tue, 29 Aug 2017 02:38:44 +0000 (10:38 +0800)]
MDL-58953 user: fix course checking logic in user_can_view_profile()

Make sure to check that $user in enrolled in $course before checking
whether the current user has capabilities in that course, and make sure
that we don't check user context caps when handling a specific course.

4 years agoMDL-58762 core: Get full course objects on navigation
Juan Leyva [Wed, 5 Jul 2017 12:18:08 +0000 (13:18 +0100)]
MDL-58762 core: Get full course objects on navigation

The course object passed as parameter to extend_navigation_user
callback contained only a few parameters, some parameters like
showgrades or showreports were missing.
The callback should receive a full course object.

4 years agoMDL-58762 report: Check group permissions in course user reports
Juan Leyva [Tue, 2 May 2017 08:04:55 +0000 (10:04 +0200)]
MDL-58762 report: Check group permissions in course user reports

Teachers were able to see any student report even with forced separated
groups and capability moodle/course:accessallgroups off.

4 years agoMerge branch 'MDL-59753-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 5 Sep 2017 11:28:53 +0000 (13:28 +0200)]
Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle

4 years agoMDL-59753 core_calendar: apply course filter without reload
Simey Lameze [Mon, 4 Sep 2017 01:04:33 +0000 (09:04 +0800)]
MDL-59753 core_calendar: apply course filter without reload

4 years agoMDL-59753 core_calendar: change course selector to normal select
Simey Lameze [Mon, 4 Sep 2017 01:03:50 +0000 (09:03 +0800)]
MDL-59753 core_calendar: change course selector to normal select

4 years agoMerge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle
David Monllao [Tue, 5 Sep 2017 05:25:09 +0000 (07:25 +0200)]
Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of...
Jun Pataleta [Tue, 5 Sep 2017 02:29:48 +0000 (10:29 +0800)]
Merge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of https://github.com/scara/moodle

4 years agoMDL-59672 coding style: whitespace fixes
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 23:36:36 +0000 (01:36 +0200)]
MDL-59672 coding style: whitespace fixes

4 years agoMerge branch 'MDL-59672-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 23:18:57 +0000 (01:18 +0200)]
Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 22:44:10 +0000 (00:44 +0200)]
Merge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 22:34:44 +0000 (00:34 +0200)]
Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 15:56:45 +0000 (16:56 +0100)]
Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-59974-master' of git://github.com/lameze/moodle
David Monllao [Mon, 4 Sep 2017 11:55:31 +0000 (13:55 +0200)]
Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 4 Sep 2017 11:45:39 +0000 (13:45 +0200)]
Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle