David Monllao [Tue, 11 Jul 2017 10:36:58 +0000 (12:36 +0200)]
Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Jul 2017 10:29:08 +0000 (11:29 +0100)]
MDL-59287 upgrade.txt: avoid misleading versions
Dan Poltawski [Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)]
Merge branch 'wip-MDL-59287-master-v3' of git://github.com/abgreeve/moodle
David Monllao [Tue, 11 Jul 2017 10:05:30 +0000 (12:05 +0200)]
Merge branch 'MDL-59431' of git://github.com/timhunt/moodle
David Monllao [Tue, 11 Jul 2017 09:41:03 +0000 (11:41 +0200)]
Merge branch 'wip-MDL-59441-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 11 Jul 2017 09:18:48 +0000 (10:18 +0100)]
Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 11 Jul 2017 09:16:40 +0000 (10:16 +0100)]
Merge branch 'MDL-59443-master-filetypesvalidation' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 11 Jul 2017 08:44:06 +0000 (10:44 +0200)]
Merge branch 'MDL-57432-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 11 Jul 2017 08:05:03 +0000 (10:05 +0200)]
Merge branch 'MDL-59383-master' of git://github.com/lameze/moodle
Simey Lameze [Mon, 10 Jul 2017 02:10:54 +0000 (10:10 +0800)]
MDL-59383 core_calendar: make event summary display on modal
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:10:03 +0000 (10:10 +0800)]
MDL-59383 core_calendar: add get_calendar_event_by_id webservice
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:08:23 +0000 (10:08 +0800)]
MDL-59383 core_calendar: add lang strings for event types
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:07:40 +0000 (10:07 +0800)]
MDL-59383 core_calendar: create summary modal templates
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:06:51 +0000 (10:06 +0800)]
MDL-59383 core_calendar: create summary modal AMD module
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:06:01 +0000 (10:06 +0800)]
MDL-59383 core_calendar: create calendar repository AMD module
Part of MDL-59333.
Simey Lameze [Mon, 10 Jul 2017 02:04:54 +0000 (10:04 +0800)]
MDL-59383 core_calendar: create main calendar AMD module
Part of MDL-59333.
Dan Poltawski [Mon, 10 Jul 2017 13:36:40 +0000 (14:36 +0100)]
Merge branch 'wip-MDL-40408-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 10 Jul 2017 13:31:06 +0000 (14:31 +0100)]
Merge branch 'wip-MDL-59262-master-2' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 10 Jul 2017 12:38:27 +0000 (14:38 +0200)]
Merge branch 'MDL-52501' of https://github.com/NeillM/moodle
Dan Poltawski [Mon, 10 Jul 2017 12:28:28 +0000 (13:28 +0100)]
Merge branch 'MDL-59317' of https://github.com/NeillM/moodle
David Monllao [Mon, 10 Jul 2017 12:26:24 +0000 (14:26 +0200)]
MDL-58851 lti: Fix undefined var PHP notice
David Monllao [Mon, 10 Jul 2017 12:25:24 +0000 (14:25 +0200)]
Merge branch 'lti_admin' of https://github.com/baholladay/moodle
Bryan Holladay [Mon, 8 May 2017 20:28:09 +0000 (16:28 -0400)]
MDL-58851 LTI module: Add LTI admin role capability
Adding a new 'mod/lti:admin' capability and passes the LTI admin role if the user has the 'mod/lti:admin' capability.
David Monllao [Mon, 10 Jul 2017 12:19:31 +0000 (14:19 +0200)]
Merge branch 'MDL-58332-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Mon, 10 Jul 2017 12:15:21 +0000 (13:15 +0100)]
Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jul 2017 10:19:09 +0000 (12:19 +0200)]
Merge branch 'MDL-59452-master-filetypesbehat' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 10 Jul 2017 10:15:00 +0000 (11:15 +0100)]
Merge branch 'MDL-58957-master' of https://github.com/sammarshallou/moodle
David Monllao [Mon, 10 Jul 2017 10:04:14 +0000 (12:04 +0200)]
Merge branch 'wip-MDL-56579-master-2' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 14 Jun 2017 17:33:22 +0000 (19:33 +0200)]
MDL-57432 upgrade: remove unused functions/settings from upgradelib
All these functions were used only by deleted upgrade steps
so it's safe to proceed with straight deletion, considering
them internal. Deletion has been documented in corresponding
upgrade.txt files:
- upgrade_mimetypes()
- upgrade_fix_missing_root_folders_draft()
- upgrade_minmaxgrade() and upgrade_minmaxgradestepignored setting
- upgrade_course_tags()
- atto_equation_update_librarygroup4_setting()
- mod_lti_upgrade_custom_separator()
These have been kept because continue being used by restore:
- upgrade_group_members_only()
- upgrade_extra_credit_weightoverride()
- upgrade_calculated_grade_items()
Eloy Lafuente (stronk7) [Wed, 14 Jun 2017 15:13:02 +0000 (17:13 +0200)]
MDL-57432 upgrade: clean < 3.0.0 upgrade steps
This just deletes all the upgrade steps previous to 3.0.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.
Also includes an upgrade step to prevent upgrading from any
version <
2015111600 (v3.0.0) as anti-cheating measure.
Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
Dan Poltawski [Fri, 9 Jun 2017 10:49:00 +0000 (11:49 +0100)]
MDL-57432 environment: raise Moodle requirement
Due to Moodle 2.7 and Moodle 3.4 not having a common compatible php version
between them to upgrade from Moodle 3.4 from Moodle 2.7 you'll need to upgrade
to a higher version first or upgrade php at the same time as upgrade,
this encourages the former.
Dan Poltawski [Thu, 8 Jun 2017 10:28:15 +0000 (11:28 +0100)]
MDL-57432 travis: move to PHP 7.x only
* We have to make the upgrade test from 3.0 to
avoid messing messing around with versions
Dan Poltawski [Thu, 8 Jun 2017 10:15:55 +0000 (11:15 +0100)]
MDL-57432 environment: raise Moodle 3.4 requirements
1) PHP minimum version raised to 7.0.0
2) Intl extension raised from optional to required
Dan Poltawski [Thu, 8 Jun 2017 10:12:27 +0000 (11:12 +0100)]
MDL-57432 environment: 3.4 base information
This is a direct copy of the 3.3 branch to
have changes under control easier in next commits.
Dan Poltawski [Thu, 8 Jun 2017 09:51:32 +0000 (10:51 +0100)]
MDL-57432 lib: unify PHP version checks
* Introduce a new php compatible library which can be used
early in execution, without Moodle dependencies
* Use it where we previously had hardcoded checks
This was originally suggested in MDL-39007.
Dan Poltawski [Mon, 10 Jul 2017 07:36:40 +0000 (08:36 +0100)]
Merge branch 'MDL-58544-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jul 2017 02:25:23 +0000 (04:25 +0200)]
Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle
Ryan Wyllie [Mon, 27 Mar 2017 05:49:27 +0000 (05:49 +0000)]
MDL-58332 message: remove concat in get_popup_notifications sql
Removed the concat to generate the uniqueid field for the popup
notifications data. The concat can't be used directly in the SQL because
the syntax changes between databases. The sql_concat helper can't be
used because it assumes all values are database columns (which they
aren't in this case).
Instead I've just removed the uniqueid field because it isn't required
for the union all to work and the field isn't being used by anything.
This should fixed the compatibility issues between databases.
Adrian Greeve [Mon, 3 Jul 2017 04:04:58 +0000 (12:04 +0800)]
MDL-59287 calendar_events: Update modules to create all events.
All events equals all calendar events including completion events.
Adrian Greeve [Tue, 4 Jul 2017 01:21:17 +0000 (09:21 +0800)]
MDL-59287 course_module: switching to new function.
Instead of using *_refresh_events directly
course_module_update_calendar_events is called so
that all types of calendar events can be updated.
Adrian Greeve [Tue, 4 Jul 2017 06:43:25 +0000 (14:43 +0800)]
MDL-59287 course_module: Create calendar event update function.
Adrian Greeve [Thu, 29 Jun 2017 01:08:34 +0000 (09:08 +0800)]
MDL-59287 core_completion: Bulk completion now updates events.
Adrian Greeve [Thu, 29 Jun 2017 01:07:50 +0000 (09:07 +0800)]
MDL-59287 core_completion: Update to unit tests.
Adrian Greeve [Thu, 29 Jun 2017 01:05:46 +0000 (09:05 +0800)]
MDL-59287 core_completion: Update API to use less DB calls.
Jake Dallimore [Fri, 7 Jul 2017 04:10:12 +0000 (12:10 +0800)]
weekly release 3.4dev
Jake Dallimore [Fri, 7 Jul 2017 04:10:10 +0000 (12:10 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Fri, 7 Jul 2017 03:11:50 +0000 (11:11 +0800)]
MDL-59468 theme: bug fix accessing db during install
AMOS bot [Thu, 6 Jul 2017 16:06:17 +0000 (00:06 +0800)]
Automatically generated installer lang files
Neill Magill [Thu, 22 Jun 2017 09:16:32 +0000 (10:16 +0100)]
MDL-59317 message: Message page taking long time to load
The OR clause in these queries used different sets of columns to select
userid which meant that the indexes that included user id could not be
used.
This change splits the query so that each individual part can use one of
the indexes that includes a userid which speeds them up considerably.
Neill Magill [Thu, 1 Jun 2017 13:42:26 +0000 (14:42 +0100)]
MDL-52501 assign: Fix group submissions without submission record
Based on work by Tim Lock <tim.lock@blackboard.com>
While upgrading to Moodle 2.8 or above it is possible for it to fail if
the site has multiple graded attempts for a user without an associated
submission record. This caused the upgrade to violate the databases
unique key rules.
This same issue could apply to a backup that was created of an
assignment that had this issue, when it is restored into Moodle 2.8 or
later.
This change adds the attempt number from the grade table into the query
that is inserting the new submission record (thanks to Tim). It also
moves the insert query before the latest flag is set on submission
records to ensure that only one has it, without this it is possible that
multiple submission records would be marked as the latest after an
upgrade or restore.
Eloy Lafuente (stronk7) [Thu, 6 Jul 2017 13:34:43 +0000 (15:34 +0200)]
Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle
Mark Nelson [Thu, 6 Jul 2017 08:36:39 +0000 (16:36 +0800)]
MDL-59395 core_user: removed unnecessary Behat javascript tags
1) Fixes a failing Behat test.
2) Speeds up two tests (including one fixed above).
Part of MDL-59290.
Mark Nelson [Thu, 6 Jul 2017 08:36:54 +0000 (16:36 +0800)]
MDL-59395 report_log: removed unnecessary Behat javascript tags
Reverts the original fix for the failing Behat tests and solves
it in a better way - it is now faster!
Part of MDL-59290.
David Mudrák [Thu, 6 Jul 2017 10:31:26 +0000 (12:31 +0200)]
MDL-56486 workshop: Add behat tests for restricting file types
Simey Lameze [Thu, 6 Jul 2017 02:30:00 +0000 (10:30 +0800)]
MDL-59456 auth_cas: patch phpCAS auth bypass vulnerability
David Mudrák [Tue, 4 Jul 2017 10:07:55 +0000 (12:07 +0200)]
MDL-56486 workshop: Deprecate custom methods for handling file types
The functionality and the tests are now part of the core element.
David Mudrák [Tue, 4 Jul 2017 09:00:52 +0000 (11:00 +0200)]
MDL-56486 workshop: Use filetypes utility class to normalize file types
David Mudrák [Tue, 4 Jul 2017 08:57:24 +0000 (10:57 +0200)]
MDL-56486 workshop: Use filetypes utility class to check submitted files
David Mudrák [Tue, 4 Jul 2017 07:57:33 +0000 (09:57 +0200)]
MDL-56486 workshop: Use the new filetypes element in the mod_form
The element copes well with the legacy syntax - just extensions, no
dots. So the upgrade step is not actually necessary here. The element
has in-built validation so there is no need to validate it explicitly
here again.
David Mudrák [Wed, 5 Jul 2017 19:00:33 +0000 (21:00 +0200)]
MDL-59443 forms: Add behat tests for the field validation
David Mudrák [Mon, 3 Jul 2017 19:03:17 +0000 (21:03 +0200)]
MDL-59443 forms: Consider '*' as a known file type
While working on the filetypes element validation, I realized we did not
cover the case of selecting 'Any file type'. So the value '*' was
falsely reported as unknown file type.
David Mudrák [Mon, 3 Jul 2017 17:37:41 +0000 (19:37 +0200)]
MDL-59443 forms: Allow implicit validation of filetypes element values
The validation obeys the element options 'allowall', 'allowunknown' and
'onlytypes' passed when creating the element.
David Mudrák [Mon, 3 Jul 2017 17:21:32 +0000 (19:21 +0200)]
MDL-59443 forms: Give elements a chance to validate submitted values
This patch introduces support for an optional method provided by the
form element classes to validate the submitted values implicitly -
without the need to have the rule explicitly added via the form
definition.
I am aware this should ideally be added to the HTML_QuickForm_element
parent class. But I wanted to avoid modification of that third party
library and keep the change in the moodleform layer only.
David Mudrák [Wed, 5 Jul 2017 16:15:31 +0000 (18:15 +0200)]
MDL-59452 forms: Add Behat test for the filetypes form element
This is a very basic test for now to illustrate that it is possible now
to specify filetypes fields by the label.
Jake Dallimore [Thu, 6 Jul 2017 07:20:41 +0000 (15:20 +0800)]
Merge branch 'MDL-59395_master-fix' of github.com:markn86/moodle
Mark Nelson [Thu, 6 Jul 2017 06:54:40 +0000 (14:54 +0800)]
MDL-59395 core_user: fixed random PHPUnit failure
Part of MDL-59290.
Jake Dallimore [Thu, 6 Jul 2017 06:48:05 +0000 (14:48 +0800)]
Merge branch 'MDL-59364-master-fix2' of github.com/damyon/moodle
Damyon Wiese [Thu, 6 Jul 2017 04:01:36 +0000 (12:01 +0800)]
MDL-59364 behat: Brief / full links removed
The selector for brief / full user details was removed, it needs removing from the behat test.
Mark Nelson [Thu, 6 Jul 2017 05:20:03 +0000 (13:20 +0800)]
MDL-59395 report_log: fixed step navigating to user profile
Part of MDL-59290.
Jake Dallimore [Thu, 6 Jul 2017 03:54:48 +0000 (11:54 +0800)]
Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle
Mark Nelson [Thu, 6 Jul 2017 03:12:32 +0000 (11:12 +0800)]
MDL-59396 block_participants: removed Behat reference to deleted select
Part of MDL-59290.
David Mudrák [Wed, 5 Jul 2017 15:38:04 +0000 (17:38 +0200)]
MDL-59452 forms: Provide a label for the filetypes input field
This is a pragmatic (read: hacky) solution of the problem that
Behat/Mink is unable to locate the input field within the filetypes
group. I've spent a while trying to figure out how to make it work. On
the road, I've discovered that our situation with labels of mform group
elements is a bit messy. And generally there seems to be no easy way how
to use the group's label to identify one particular input field in the
group.
In this case, we use mform group but in fact there is a single input
field within the group. Mink does not locate the group itself as an
input field and throws ElementNotFoundException. So reusing the group's
label as a hidden label for the input makes sense from certain
perspective.
The potential drawback (unconfirmed) is that screen readers might read
the same label text twice. But only one of them is associated with the
actual input field so chances are they would ignore the group's one,
like Mink does.
Jun Pataleta [Wed, 5 Jul 2017 14:49:44 +0000 (22:49 +0800)]
MDL-58651 logstore_database: Set dbhandlesoptions in test page
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 10:24:45 +0000 (12:24 +0200)]
Merge branch 'MDL-57021-master-v2' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 10:00:12 +0000 (12:00 +0200)]
Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 09:51:05 +0000 (11:51 +0200)]
Merge branch 'MDL-59398-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 07:42:41 +0000 (09:42 +0200)]
Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 07:39:21 +0000 (09:39 +0200)]
Merge branch 'MDL-58286-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 07:34:19 +0000 (09:34 +0200)]
Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle
Helen Foster [Wed, 5 Jul 2017 07:27:29 +0000 (09:27 +0200)]
MDL-59398 lang: Merge English strings from the en_fix language pack
Mark Nelson [Mon, 3 Jul 2017 08:08:24 +0000 (16:08 +0800)]
MDL-59395 core_user: added unit tests for new participation functions
Part of MDL-59290.
Mark Nelson [Wed, 28 Jun 2017 03:44:20 +0000 (11:44 +0800)]
MDL-59395 core_user: move participants table to own class
Removed the edit link variable which was used in the heading
'Users with the role ..' but was never displayed due to filters.
Other minor tidy ups as well.
Part of MDL-59290.
Jake Dallimore [Wed, 5 Jul 2017 05:03:56 +0000 (13:03 +0800)]
Merge branch 'MDL-58716-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 5 Jul 2017 04:39:18 +0000 (12:39 +0800)]
MDL-58716 core: Define core_login_testsuite in phpunit.xml.dist
Marina Glancy [Thu, 29 Jun 2017 02:37:09 +0000 (10:37 +0800)]
MDL-59412 course: do not display completion icon for unavailable mod
John Okely [Tue, 6 Jun 2017 02:50:01 +0000 (10:50 +0800)]
MDL-58286 enrol_ldap: Pass connection to ldap_paged_results_supported
Thanks to Bianco Veigel for the original patch.
Jun Pataleta [Wed, 5 Jul 2017 01:36:41 +0000 (09:36 +0800)]
Merge branch 'MDL-58716-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 00:35:26 +0000 (02:35 +0200)]
Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 00:33:09 +0000 (02:33 +0200)]
Merge branch 'MDL-59396_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jul 2017 00:31:48 +0000 (02:31 +0200)]
Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jul 2017 23:21:13 +0000 (01:21 +0200)]
Merge branch 'MDL-58651' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jul 2017 17:58:51 +0000 (19:58 +0200)]
Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jul 2017 17:44:07 +0000 (19:44 +0200)]
Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle
Juan Leyva [Wed, 14 Jun 2017 13:18:06 +0000 (14:18 +0100)]
MDL-58716 auth: New ajax WS core_auth_request_password_reset
Juan Leyva [Wed, 14 Jun 2017 13:17:33 +0000 (14:17 +0100)]
MDL-58716 login: API changes to accommodate web services
Jake Dallimore [Tue, 4 Jul 2017 08:27:30 +0000 (16:27 +0800)]
Merge branch 'MDL-59380-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 4 Jul 2017 03:16:08 +0000 (11:16 +0800)]
MDL-59441 calendar: unittest fix for modules without generators
Marina Glancy [Tue, 4 Jul 2017 02:58:14 +0000 (10:58 +0800)]
MDL-59409 admin: set admin user in unittest
Marina Glancy [Fri, 30 Jun 2017 02:58:54 +0000 (10:58 +0800)]
MDL-59262 tool_uploadcourse: allow to set numsections
Ankit Agarwal [Tue, 13 Jun 2017 07:08:22 +0000 (12:38 +0530)]
MDL-56565 forum: Add sitename as heading when there is nothing to display