84805 Commits

Author SHA1 Message Date
Dan Poltawski
877d997fe1 MDL-57139 messages/notifications: ensure promise best practices
Previously there were a few issues with the code

* We were capturing a promise without then then .then() that came after
  it, so our promise wouldn't always be completely resolved by the time
  then next piece of code was operating on it

* We weren't catching all errors with .catch()
2017-06-01 10:27:58 +01:00
Dan Poltawski
66a91ddada MDL-57139 eslint: enable eslint-plugin-promise rules
For promise best practices
2017-06-01 10:27:58 +01:00
Dan Poltawski
78ab4f741b weekly release 3.4dev 2017-06-01 09:28:17 +01:00
Dan Poltawski
012ac814a6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-06-01 09:28:14 +01:00
David Mudrák
8cf36e9c81 MDL-53240 filetypes: Introduce admin_setting_filetypes class
This new type of admin settings makes use of the filetypes browser but
for the admin settings.
2017-06-01 09:48:45 +02:00
Jake Dallimore
9ced5fcc7b Merge branch 'MDL-59094-master' of git://github.com/danpoltawski/moodle 2017-06-01 15:27:57 +08:00
David Mudrák
8b493eb09d MDL-53240 filetypes: Enhance the filetypes element with a types browser 2017-06-01 09:20:07 +02:00
John Okely
86bb4f5bf2 MDL-53240 filetypes: Add functions to be used for input validation 2017-06-01 09:18:38 +02:00
David Mudrák
e3ad9db6b6 MDL-53240 filetypes: Add methods for generating the browser tree content
These new methods will be used to render the tree of file types groups
and extensions in the browser widget.

Co-Authored-By: John Okely <john@moodle.com>
2017-06-01 09:18:38 +02:00
Jonathon Fowler
97bb4f755e MDL-53240 filetypes: Introduce the form element to specify plugin types
This is a stripped down version of the original Jonathon's element
without the actual JS selector. The options "allowall" and "onlytypes"
are not fully supported right now yet.
2017-06-01 09:18:38 +02:00
David Mudrák
6c4a5fdf88 MDL-53240 filetypes: Introduce the filetypes_util helper class 2017-06-01 09:18:38 +02:00
AMOS bot
d4bf7e8a39 Automatically generated installer lang files 2017-06-01 00:11:46 +08:00
Dan Poltawski
67c70db593 Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle 2017-05-31 11:09:06 +01:00
Dan Poltawski
94e6425103 MDL-59094 npm: Update shrinkwrap file to npm 5 generated
Starting with npm version 5, npm install will generate a lockfile
(now named package-lock.json) or update the existing npm-shrinkwrap.json

To prevent changes being generated in the codebase when this happens, we
need to commit the version 5 generated shrinkwrap.

This is related to a general overhaul [1] of how npm manages things. But
for our purposes, we the lockfile should be BC to previous versions [2].

Going forward, we need to ensure we generate the lockfile on npm >=5 to
prevent differences from the previously un-versioned lockfile.

[1] http://blog.npmjs.org/post/161081169345/v500
[2] https://github.com/npm/npm/issues/16728#issuecomment-305104149
2017-05-31 10:10:03 +01:00
gthomas2
bd87693fd6 MDL-57304 templates: Do not include comments via ajax 2017-05-31 09:09:53 +01:00
Jun Pataleta
723742fee0 MDL-59093 calendar: Use a fixed start day for forever BYMONTH test 2017-05-31 15:01:34 +08:00
Simey Lameze
dc0deaf04d MDL-58900 mod_assign: fix incorrect overrides ordering 2017-05-31 10:50:28 +08:00
Jake Dallimore
4ff1fef79f Merge branch 'MDL-58654_global_search_batch' of https://github.com/mattporritt/moodle 2017-05-31 09:05:29 +08:00
Jake Dallimore
ea1676f761 Merge branch 'MDL-54887-master' of git://github.com/junpataleta/moodle 2017-05-31 08:35:05 +08:00
Eloy Lafuente (stronk7)
32a627d7cf Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle 2017-05-31 00:30:08 +02:00
Matt Porritt
0a9a10f029 MDL-58654 Global search: Allow engines to support batch processing.
Allow Global Search 3rd party engines to be much faster by supporting batch processing.
Refactor the iterator loop for the documents to add to the search index into its own method.
Move this new method from the manger class to the base engine class.
The move to the base engine class will allow search engine plugins to override this and determine
how they implment it. It will not break the existing interface contract with existing plugins.

Finally, add an elasped time indication to the trace output.
2017-05-31 08:28:12 +10:00
Dan Poltawski
1a07f9f037 Merge branch 'MDL-58997-group-names-multilang' of https://github.com/lucaboesch/moodle 2017-05-30 16:53:06 +01:00
Luca Bösch
29b83cbb34 MDL-58997 calendar: Group names passing multilang filters. 2017-05-30 16:42:52 +02:00
Dan Poltawski
a8aa1a0362 Merge branch 'MDL-59041-master' of git://github.com/junpataleta/moodle 2017-05-30 14:05:13 +01:00
Jun Pataleta
5e0af1da71 MDL-59041 calendar: Make PRODID of exported ics attributed to Moodle 2017-05-30 19:33:01 +08:00
Eloy Lafuente (stronk7)
7ec40aac16 Merge branch 'MDL-58994-master' of git://github.com/cameron1729/moodle 2017-05-30 13:23:29 +02:00
Jun Pataleta
8334c8a0a0 Merge branch 'MDL-50273-master' of git://github.com/danpoltawski/moodle 2017-05-30 19:21:35 +08:00
Dan Poltawski
6ed955f16c Merge branch 'MDL-59075' of git://github.com/stronk7/moodle 2017-05-30 12:17:38 +01:00
Dan Poltawski
64fe8bfe94 Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle 2017-05-30 11:42:23 +01:00
Dan Poltawski
31245d8746 Merge branch 'MDL-50266-master' of git://github.com/ankitagarwal/moodle 2017-05-30 10:38:14 +01:00
Dan Poltawski
53ca9cc890 MDL-50273 deprecatedlib: final deprecation of groups functions 2017-05-30 10:23:33 +01:00
Jun Pataleta
50b4c5a491 Merge branch 'MDL-57313-master-clibootswatch' of git://github.com/mudrd8mz/moodle 2017-05-30 16:57:29 +08:00
Dan Poltawski
b1846b8a17 Merge branch 'MDL-50632-master' of git://github.com/ankitagarwal/moodle 2017-05-30 09:55:34 +01:00
Jun Pataleta
e083ac1cde MDL-54887 calendar: PR fixes
* Use the calendar_event::description property and format it using
format_text() on it in order to apply the appropriate filters.
* Then use html_to_text() on it to strip the tags and convert the
description to plain text while converting <br> and <p> tags to
line breaks.
2017-05-30 16:52:12 +08:00
Soon-Systems
231ddd5a8d MDL-54887 calendar: Format summary + description of an event for export 2017-05-30 16:32:36 +08:00
Eloy Lafuente (stronk7)
6308dad828 MDL-59075 behat: Update master to use 3.34.0 behat extension tag 2017-05-30 09:45:40 +02:00
Dan Poltawski
c744efe5bc Merge branch 'MDL-59014-master' of git://github.com/junpataleta/moodle 2017-05-30 08:31:47 +01:00
Mark Nelson
9bd705e3dd MDL-59086 gradereport_grader: style 'Save changes' button 2017-05-30 13:43:37 +08:00
Jake Dallimore
a142f6dc59 Merge branch 'MDL-44905' of https://github.com/anieminen/moodle 2017-05-30 09:32:03 +08:00
Arto Nieminen
81d7b77d6f MDL-44905 mod_scorm: Skip view page on a Single activity course
Allow 'Student skip content structure page: Always' option with 'Single
activity' course format, and redirect 'Exit activity' back to site home
if user has no report access.
2017-05-29 20:32:40 +03:00
David Mudrák
017d0bc199 MDL-57313 boost: Fix the CLI utility import-bootswatch.php 2017-05-26 09:52:18 +02:00
Dan Poltawski
9e7afbbc6c weekly release 3.4dev 2017-05-24 19:14:39 +01:00
Dan Poltawski
e543846602 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-24 19:14:37 +01:00
Tim Hunt
de4f0f25ea MDL-59048 user tours: avoid white-on-white text in Clean 2017-05-24 17:48:21 +01:00
Ankit Agarwal
8130352f5a MDL-50632 filters: Final deprecation of apis deprecated in 3.0 2017-05-24 12:44:27 +05:30
Andrew Nicols
44dd6d95e2 Merge branch 'MDL-59011-master' of git://github.com/ankitagarwal/moodle 2017-05-24 14:18:34 +08:00
Damyon Wiese
d4d414694a MDL-58318 setuplib: Redirect on https mismatch
When the wwwroot indicates https support and a page is accessed over http,
redirect to the wwwroot. This is a better experience than displaying an error.
2017-05-24 13:42:34 +08:00
Ankit Agarwal
23cef8753b MDL-59011 restore: Check for userride only for activity events 2017-05-24 09:58:46 +05:30
Andrew Nicols
4680221da4 MDL-58577 stats: Correct groupby when getting report options 2017-05-23 19:40:37 +08:00
Andrew Nicols
1c74ec835b Merge branch 'MDL-58577-statistics-report-header-multilang' of https://github.com/lucaboesch/moodle 2017-05-23 19:36:05 +08:00