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
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
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
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
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
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
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.
Jun Pataleta [Tue, 16 May 2017 09:41:51 +0000 (17:41 +0800)]
Merge branch 'MDL-58811-master-extra-slash' of https://github.com/dmitriim/moodle
Josh Ebarvia [Wed, 3 May 2017 04:08:38 +0000 (13:38 +0930)]
MDL-58795 gradereport_grader: Prevent duplicates in grader report
Currently, the sorting being used for the grader report table
(asc/desc arrows) is just the grade_grades.finalgrade.
This adds grade_grades.userid in the sort to prevent duplicate
in records returned when using pages.
Jake Dallimore [Tue, 16 May 2017 07:15:04 +0000 (15:15 +0800)]
Merge branch 'MDL-58723-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 26 Apr 2017 02:42:45 +0000 (10:42 +0800)]
MDL-58723 calendar: Better testing of forever recurring events
* Change the start date of the parent event to the current date
for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
generate more than 100 event records.
Andrew Nicols [Tue, 16 May 2017 05:52:05 +0000 (13:52 +0800)]
Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle
Luca Bösch [Fri, 28 Apr 2017 11:35:51 +0000 (13:35 +0200)]
MDL-58756 stats: Use multilang with role.
Dmitrii Metelkin [Fri, 5 May 2017 01:46:53 +0000 (11:46 +1000)]
MDL-58811 backup: fix an extra slash on restore for the legacy files
David Monllao [Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)]
Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle
Jake Dallimore [Tue, 16 May 2017 01:57:05 +0000 (09:57 +0800)]
Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
sam marshall [Mon, 15 May 2017 16:45:45 +0000 (17:45 +0100)]
MDL-58947 Search: Label URLs not correctly calculated
AMOS bot [Mon, 15 May 2017 16:06:43 +0000 (00:06 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)]
Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 15 May 2017 10:45:17 +0000 (11:45 +0100)]
Merge branch 'MDL-58936_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 15 May 2017 10:14:19 +0000 (11:14 +0100)]
Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)]
Merge branch 'MDL-58916-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 15 May 2017 09:46:00 +0000 (10:46 +0100)]
Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 15 May 2017 09:23:02 +0000 (10:23 +0100)]
Merge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboesch/moodle
Dan Poltawski [Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)]
Merge branch 'MDL-58932' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 15 May 2017 07:12:38 +0000 (15:12 +0800)]
Merge branch 'MDL-58893-master-missing-div' of https://github.com/dmitriim/moodle
Andrew Nicols [Mon, 15 May 2017 05:57:04 +0000 (13:57 +0800)]
Merge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github.com/lucaboesch/moodle
Dmitrii Metelkin [Thu, 11 May 2017 05:03:35 +0000 (15:03 +1000)]
MDL-58893 portfolio: add missing closing div
Mark Nelson [Mon, 15 May 2017 04:20:15 +0000 (12:20 +0800)]
MDL-58936 core: ensure 'page->context' is not null
When using $page->context it calls magic_get_context() in lib/pagelib.php.
This method sets the context to context_system::instance() if it is currently
null and returns that as the context. However, when installing a new site
context_system::instance() also returns null.
Ankit Agarwal [Mon, 15 May 2017 04:15:09 +0000 (09:45 +0530)]
MDL-58929 converters: Make link title consistent
John Okely [Fri, 12 May 2017 07:52:37 +0000 (15:52 +0800)]
MDL-58916 user_profile: Pass site context when determining menu options
Eloy Lafuente (stronk7) [Sun, 14 May 2017 22:43:40 +0000 (00:43 +0200)]
MDL-58932 backup: Bump release to 3.4
Luca Bösch [Mon, 8 May 2017 21:14:48 +0000 (23:14 +0200)]
MDL-58852 choice: Use multilang for choice options in charts
Luca Bösch [Fri, 12 May 2017 11:00:39 +0000 (13:00 +0200)]
MDL-58920 questions: Calculated question name passing multilang.
In "Shared wild cards" table calculated question name do pass format_string to process multilang tags.
Thus, not breaking the layout any more.
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:53:28 +0000 (11:53 +0200)]
weekly back-to-dev release 3.4dev
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:35 +0000 (11:46 +0200)]
NOBUG: Change travis.yml back to master
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
Moodle release 3.3
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
NOBUG: Change travis.yml to MOODLE_33_STABLE
AMOS bot [Sat, 13 May 2017 16:04:26 +0000 (00:04 +0800)]
Automatically generated installer lang files
AMOS bot [Fri, 12 May 2017 16:04:20 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 12 May 2017 09:02:41 +0000 (10:02 +0100)]
Moodle release 3.3rc3
Dan Poltawski [Fri, 12 May 2017 09:02:40 +0000 (10:02 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 12 May 2017 07:19:07 +0000 (08:19 +0100)]
Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle
Jake Dallimore [Fri, 12 May 2017 07:10:23 +0000 (15:10 +0800)]
MDL-58904 restore: temp fix for event priority notices
Jun Pataleta [Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)]
Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle
David Monllao [Fri, 12 May 2017 05:37:40 +0000 (13:37 +0800)]
MDL-58905 auth_oauth2: Return if no issuers allow login
David Monllao [Fri, 12 May 2017 02:17:06 +0000 (10:17 +0800)]
MDL-58905 auth_oauth2: Add plugin enabled checkings
David Monllao [Fri, 12 May 2017 02:07:46 +0000 (10:07 +0800)]
MDL-58905 auth_oauth2: No linked accounts if the plugin is not enabled
Andrew Nicols [Fri, 12 May 2017 04:32:23 +0000 (12:32 +0800)]
Merge branch 'MDL-58898-master' of https://github.com/xow/moodle
John Okely [Fri, 12 May 2017 04:15:25 +0000 (12:15 +0800)]
MDL-58898 oauth: Cover orphaned linked logins in unit tests
John Okely [Fri, 12 May 2017 03:48:11 +0000 (11:48 +0800)]
MDL-58898 oauth: Remove orphaned linked logins
Jun Pataleta [Fri, 12 May 2017 04:00:52 +0000 (12:00 +0800)]
Merge branch 'MDL-58899-master' of https://github.com/snake/moodle
Jake Dallimore [Fri, 12 May 2017 02:42:40 +0000 (10:42 +0800)]
MDL-58899 auth: improve lang strings for confirmation failures in oauth
David Monllao [Fri, 12 May 2017 03:07:42 +0000 (11:07 +0800)]
Merge branch 'MDL-58774-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)]
Merge branch 'MDL-58904' of git://github.com/stronk7/moodle
Andrew Nicols [Thu, 11 May 2017 22:44:43 +0000 (06:44 +0800)]
MDL-58774 auth_oauth2: Only check unexpired accounts for same issuer
It shoudl be possible to link multiple OAuth2 sources which have the
same e-mail address to an account.
This patch makes the check for an existing linked account stricter so
that it only checks for linked account records which match the same
issuer, and which do not have expired confirmation tokens.
Eloy Lafuente (stronk7) [Thu, 11 May 2017 17:55:21 +0000 (19:55 +0200)]
MDL-58904 backup: old backups do not contain new fields
Hence we need to apply DB defaults for them when missing:
- type = 0
- timesort = null
AMOS bot [Thu, 11 May 2017 16:04:11 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 11 May 2017 13:29:11 +0000 (14:29 +0100)]
MDL-58837 js: fix jsdoc error
Dan Poltawski [Thu, 11 May 2017 13:26:33 +0000 (14:26 +0100)]
Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 11 May 2017 03:54:57 +0000 (11:54 +0800)]
MDL-58837 course: do not confirm deleting empty sections
Marina Glancy [Thu, 11 May 2017 03:42:53 +0000 (11:42 +0800)]
MDL-58837 course: allow to add multiple sections
Jake Dallimore [Thu, 11 May 2017 03:41:48 +0000 (11:41 +0800)]
Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle
Issam Taboubi [Wed, 10 May 2017 17:24:00 +0000 (13:24 -0400)]
MDL-58884 competency: Inaccurate stats proficient competencies in course
AMOS bot [Wed, 10 May 2017 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)]
Merge branch 'MDL-58874-master' of https://github.com/xow/moodle
Dan Poltawski [Wed, 10 May 2017 11:01:08 +0000 (12:01 +0100)]
Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle