Eloy Lafuente (stronk7) [Mon, 5 Jun 2017 23:34:21 +0000 (01:34 +0200)]
Merge branch 'MDL-59096-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 5 Jun 2017 21:38:23 +0000 (23:38 +0200)]
Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 5 Jun 2017 20:27:52 +0000 (22:27 +0200)]
Merge branch 'MDL-58970-master' of https://github.com/abias/moodle
David Mudrák [Mon, 5 Jun 2017 18:50:28 +0000 (20:50 +0200)]
MDL-53240 filetypes: Use multibyte safe variant of strtolower
Credit goes to failed unit tests.
Dan Poltawski [Mon, 5 Jun 2017 13:54:54 +0000 (14:54 +0100)]
Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 5 Jun 2017 11:49:03 +0000 (12:49 +0100)]
Merge branch 'MDL-59080_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 5 Jun 2017 11:39:47 +0000 (12:39 +0100)]
Merge branch 'MDL-58567-master-v2' of https://github.com/sammarshallou/moodle
Dan Poltawski [Sat, 3 Jun 2017 07:54:43 +0000 (08:54 +0100)]
Merge branch 'MDL-59091_gherkinlint_fix' of https://github.com/mrmark/moodle
Alexander Bias [Wed, 17 May 2017 19:01:09 +0000 (21:01 +0200)]
MDL-58970 themes: Fix references to core/loginform template
Mark Nielsen [Fri, 2 Jun 2017 16:31:40 +0000 (09:31 -0700)]
MDL-59091 behat: Fix gherkinlint errors
Just whitespace problems.
Mark Nielsen [Fri, 2 Jun 2017 16:27:48 +0000 (09:27 -0700)]
MDL-59091 behat: Properly propagate gherkinlint exit code
sam marshall [Wed, 31 May 2017 13:08:49 +0000 (14:08 +0100)]
MDL-59096 Tasks: Web running local plugin scheduled tasks fails
sam marshall [Tue, 11 Apr 2017 10:01:42 +0000 (11:01 +0100)]
MDL-58567 Upgrade: Show upgrade times
Mary Evans [Mon, 29 May 2017 09:18:53 +0000 (10:18 +0100)]
MDL-59080 theme_boost: make drawer.scss variables default
--author="Urs Hunkler <urs.hunkler@unodo.de>"
Dan Poltawski [Thu, 1 Jun 2017 08:28:17 +0000 (09:28 +0100)]
weekly release 3.4dev
Dan Poltawski [Thu, 1 Jun 2017 08:28:14 +0000 (09:28 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Mudrák [Tue, 4 Apr 2017 23:21:48 +0000 (01:21 +0200)]
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.
Jake Dallimore [Thu, 1 Jun 2017 07:27:57 +0000 (15:27 +0800)]
Merge branch 'MDL-59094-master' of git://github.com/danpoltawski/moodle
David Mudrák [Tue, 28 Mar 2017 22:40:06 +0000 (00:40 +0200)]
MDL-53240 filetypes: Enhance the filetypes element with a types browser
John Okely [Thu, 30 Mar 2017 04:14:52 +0000 (12:14 +0800)]
MDL-53240 filetypes: Add functions to be used for input validation
David Mudrák [Wed, 29 Mar 2017 16:45:53 +0000 (18:45 +0200)]
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>
Jonathon Fowler [Fri, 24 Mar 2017 20:03:04 +0000 (21:03 +0100)]
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.
David Mudrák [Fri, 24 Mar 2017 21:16:33 +0000 (22:16 +0100)]
MDL-53240 filetypes: Introduce the filetypes_util helper class
AMOS bot [Wed, 31 May 2017 16:11:46 +0000 (00:11 +0800)]
Automatically generated installer lang files
Dan Poltawski [Wed, 31 May 2017 10:09:06 +0000 (11:09 +0100)]
Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 31 May 2017 08:48:37 +0000 (09:48 +0100)]
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
Jun Pataleta [Wed, 31 May 2017 07:01:34 +0000 (15:01 +0800)]
MDL-59093 calendar: Use a fixed start day for forever BYMONTH test
Jake Dallimore [Wed, 31 May 2017 01:05:29 +0000 (09:05 +0800)]
Merge branch 'MDL-58654_global_search_batch' of https://github.com/mattporritt/moodle
Jake Dallimore [Wed, 31 May 2017 00:35:05 +0000 (08:35 +0800)]
Merge branch 'MDL-54887-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 30 May 2017 22:30:08 +0000 (00:30 +0200)]
Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle
Matt Porritt [Wed, 12 Apr 2017 02:42:25 +0000 (12:42 +1000)]
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.
Dan Poltawski [Tue, 30 May 2017 15:52:06 +0000 (16:52 +0100)]
Merge branch 'MDL-58997-group-names-multilang' of https://github.com/lucaboesch/moodle
Luca Bösch [Fri, 19 May 2017 15:05:02 +0000 (17:05 +0200)]
MDL-58997 calendar: Group names passing multilang filters.
Dan Poltawski [Tue, 30 May 2017 13:05:13 +0000 (14:05 +0100)]
Merge branch 'MDL-59041-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 24 May 2017 05:16:44 +0000 (13:16 +0800)]
MDL-59041 calendar: Make PRODID of exported ics attributed to Moodle
Eloy Lafuente (stronk7) [Tue, 30 May 2017 10:51:01 +0000 (12:51 +0200)]
Merge branch 'MDL-58994-master' of git://github.com/cameron1729/moodle
Jun Pataleta [Tue, 30 May 2017 11:21:35 +0000 (19:21 +0800)]
Merge branch 'MDL-50273-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 30 May 2017 11:17:38 +0000 (12:17 +0100)]
Merge branch 'MDL-59075' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 30 May 2017 10:42:23 +0000 (11:42 +0100)]
Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle
Dan Poltawski [Tue, 30 May 2017 09:38:14 +0000 (10:38 +0100)]
Merge branch 'MDL-50266-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 17 May 2017 16:47:12 +0000 (17:47 +0100)]
MDL-50273 deprecatedlib: final deprecation of groups functions
Jun Pataleta [Tue, 30 May 2017 08:57:29 +0000 (16:57 +0800)]
Merge branch 'MDL-57313-master-clibootswatch' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 30 May 2017 08:55:34 +0000 (09:55 +0100)]
Merge branch 'MDL-50632-master' of git://github.com/ankitagarwal/moodle
Jun Pataleta [Fri, 17 Feb 2017 01:16:16 +0000 (09:16 +0800)]
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.
Soon-Systems [Tue, 7 Feb 2017 08:28:51 +0000 (09:28 +0100)]
MDL-54887 calendar: Format summary + description of an event for export
Eloy Lafuente (stronk7) [Mon, 29 May 2017 01:27:24 +0000 (03:27 +0200)]
MDL-59075 behat: Update master to use 3.34.0 behat extension tag
Dan Poltawski [Tue, 30 May 2017 07:31:47 +0000 (08:31 +0100)]
Merge branch 'MDL-59014-master' of git://github.com/junpataleta/moodle
Jake Dallimore [Tue, 30 May 2017 01:32:03 +0000 (09:32 +0800)]
Merge branch 'MDL-44905' of https://github.com/anieminen/moodle
Arto Nieminen [Mon, 3 Apr 2017 11:48:21 +0000 (14:48 +0300)]
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.
David Mudrák [Mon, 8 May 2017 13:03:34 +0000 (15:03 +0200)]
MDL-57313 boost: Fix the CLI utility import-bootswatch.php
Dan Poltawski [Wed, 24 May 2017 18:14:39 +0000 (19:14 +0100)]
weekly release 3.4dev
Dan Poltawski [Wed, 24 May 2017 18:14:37 +0000 (19:14 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Ankit Agarwal [Thu, 18 May 2017 14:28:31 +0000 (19:58 +0530)]
MDL-50632 filters: Final deprecation of apis deprecated in 3.0
Andrew Nicols [Wed, 24 May 2017 06:18:34 +0000 (14:18 +0800)]
Merge branch 'MDL-59011-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Mon, 22 May 2017 08:48:04 +0000 (14:18 +0530)]
MDL-59011 restore: Check for userride only for activity events
Andrew Nicols [Tue, 23 May 2017 11:40:35 +0000 (19:40 +0800)]
MDL-58577 stats: Correct groupby when getting report options
Andrew Nicols [Tue, 23 May 2017 11:36:05 +0000 (19:36 +0800)]
Merge branch 'MDL-58577-statistics-report-header-multilang' of https://github.com/lucaboesch/moodle
Jun Pataleta [Tue, 23 May 2017 09:20:31 +0000 (17:20 +0800)]
MDL-59014 calendar: Unescape event URL for the mini calendar
Luca Bösch [Fri, 28 Apr 2017 11:01:55 +0000 (13:01 +0200)]
MDL-58577 stats: Use multilang with role in header
Jun Pataleta [Tue, 23 May 2017 08:53:00 +0000 (16:53 +0800)]
Merge branch 'MDL-58895-master' of git://github.com/ankitagarwal/moodle
Jake Dallimore [Tue, 23 May 2017 08:25:27 +0000 (16:25 +0800)]
Merge branch 'MDL-58921-calculated-question-name-multilang' of https://github.com/lucaboesch/moodle
Jun Pataleta [Tue, 23 May 2017 06:41:42 +0000 (14:41 +0800)]
Merge branch 'MDL-58165-master' of https://github.com/abias/moodle
Alexander Bias [Wed, 17 May 2017 06:18:23 +0000 (08:18 +0200)]
MDL-58165 navigation: Add node key to private files navigation node
Ankit Agarwal [Mon, 15 May 2017 04:25:02 +0000 (09:55 +0530)]
MDL-58895 groups: Add bootstrap classes to buttons
Josh Ebarvia [Mon, 22 May 2017 03:39:03 +0000 (13:09 +0930)]
MDL-49040 gradereport_grader: Fix feedback truncation after & char
AMOS bot [Mon, 22 May 2017 16:05:26 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 22 May 2017 09:46:47 +0000 (10:46 +0100)]
Merge branch 'MDL-58922-calculatedmulti-question-name-multilang' of https://github.com/lucaboesch/moodle
Luca Bösch [Fri, 12 May 2017 11:24:28 +0000 (13:24 +0200)]
MDL-58921 questions: Calculated question name passing multilang.
In edit calculated question the question name does pass format_string to process multilang tags.
Luca Bösch [Fri, 12 May 2017 11:29:48 +0000 (13:29 +0200)]
MDL-58922 questions: Calculatedmulti question name passing multilang.
In edit calculatedmulti question the question name does pass format_string to process multilang tags.
David Monllao [Mon, 22 May 2017 07:13:58 +0000 (15:13 +0800)]
Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle
Jake Dallimore [Mon, 22 May 2017 06:31:37 +0000 (14:31 +0800)]
Merge branch 'MDL-56617-course-cbm-grade-to-pass' of https://github.com/lucaboesch/moodle
Jun Pataleta [Mon, 22 May 2017 06:12:36 +0000 (14:12 +0800)]
Merge branch 'MDL-58933' of git://github.com/stronk7/moodle
David Monllao [Mon, 22 May 2017 04:21:11 +0000 (12:21 +0800)]
Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle
Jun Pataleta [Mon, 22 May 2017 02:47:31 +0000 (10:47 +0800)]
Merge branch 'MDL-58966-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 22 May 2017 02:41:46 +0000 (10:41 +0800)]
Merge branch 'MDL-57957' of https://github.com/bostelm/moodle
AMOS bot [Sat, 20 May 2017 16:04:03 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 16 May 2017 00:04:27 +0000 (02:04 +0200)]
MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts
Luca Bösch [Tue, 16 May 2017 20:21:27 +0000 (22:21 +0200)]
MDL-56617 mod_quiz: No grade to pass check if CBM used
When certainty-based marking is used, grades can 'exceed' the maximum grade
(because they are multiplied by factors). Therefore, in such cases, don't show
no warning.
Grzegorz Ziółek [Tue, 16 May 2017 07:25:02 +0000 (09:25 +0200)]
MDL-56973 wiki: New page title readonly after changing course language
Cameron Ball [Fri, 19 May 2017 07:08:05 +0000 (15:08 +0800)]
MDL-58994 core_calendar: Coalesce event sort field
There are situations where we need to sort events on a field called
"timesort", but sometimes it is not set. So we can fall back to
"timestart" in this case.
David Monllao [Fri, 19 May 2017 05:11:14 +0000 (13:11 +0800)]
weekly on-sync release 3.4dev
David Monllao [Fri, 19 May 2017 05:11:12 +0000 (13:11 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 18 May 2017 08:54:11 +0000 (09:54 +0100)]
MDL-58966 completion: improve dashboard string
Mark Nelson [Thu, 18 May 2017 08:49:01 +0000 (16:49 +0800)]
MDL-58986 mod_quiz: add CSS classes to buttons on comment page
Ankit Agarwal [Thu, 18 May 2017 03:46:45 +0000 (09:16 +0530)]
MDL-50266 mod_forum: Remove strings deprecated in 3.0
Ankit Agarwal [Thu, 18 May 2017 03:13:43 +0000 (08:43 +0530)]
MDL-50266 block_tags: Remove strings deprecated in 3.0
Ankit Agarwal [Thu, 18 May 2017 03:11:14 +0000 (08:41 +0530)]
MDL-50266 core: Remove strings deprecated in 3.0
Ankit Agarwal [Thu, 18 May 2017 03:04:33 +0000 (08:34 +0530)]
MDL-50266 lesson: Remove strings deprecated in 3.0
Alexander Bias [Wed, 17 May 2017 18:58:46 +0000 (20:58 +0200)]
MDL-58970 themes: Rename login.mustache to loginform.mustache
AMOS bot [Wed, 17 May 2017 16:06:54 +0000 (00:06 +0800)]
Automatically generated installer lang files
Dan Poltawski [Wed, 17 May 2017 11:11:56 +0000 (12:11 +0100)]
Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle
Mark Nelson [Wed, 17 May 2017 10:42:26 +0000 (18:42 +0800)]
MDL-58776 core_tag: removed whitespace from id attribute
This was preventing the JS from finding the element.
Simey Lameze [Wed, 17 May 2017 05:02:48 +0000 (13:02 +0800)]
MDL-58884 core_competency: add exporter required course fields
Jake Dallimore [Wed, 17 May 2017 01:15:09 +0000 (09:15 +0800)]
Merge branch 'MDL-58947-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 16 May 2017 22:59:36 +0000 (06:59 +0800)]
Merge branch 'MDL-58795-master' of https://github.com/jebarviabb/moodle
Daniel Materka [Tue, 16 May 2017 18:00:02 +0000 (19:00 +0100)]
MDL-49988 wiki: fix broken page layout if html contains line breaks
Dan Poltawski [Tue, 16 May 2017 16:48:56 +0000 (17:48 +0100)]
Merge branch 'MDL-58776-master' of git://github.com/ankitagarwal/moodle
AMOS bot [Tue, 16 May 2017 16:08:41 +0000 (00:08 +0800)]
Automatically generated installer lang files
Henning Bostelmann [Tue, 25 Apr 2017 10:57:19 +0000 (11:57 +0100)]
MDL-57957 mod_assign: show feedback file in absence of grade item
Iñaki Arenaza [Fri, 30 Dec 2016 23:01:52 +0000 (00:01 +0100)]
MDL-57558 ldap: fix ldap_get_entries_moodle()
While ldap_get_entries_moodle() PHPdocs state that it returns "array
ldap-entries with lower-cased attributes as indexes.", this is not true. It
uses ldap_get_attributes() internally, which returns both numerically indexed
attribute names, and dictionary-like entries indexed by attribute names.
Current code lowercases the dictionary-like entries, but then uses the
numerically indexed entries for the attribute names used as keys in the
returned array. The numerically indexed names might or might not be lowercased,
depending on the LDAP server and PHP version) version. E.g., OpenLDAP 2.x,
Novell eDirectory 8.x and MS Active Directory return mixed-cased attribute
names, and PHP 5.x and PHP 7.x don't lowercase them inside ldap_get_entries().
This is probably why all calls to ldap_get_entries_moodle() are followed by
calls to array_change_key_case(), even if that shouldn't be necessary.
So make sure we always return lower-cased attributs as indexes and add some
unit tests to avoid regressions in the future.