84982 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f84bdb4347 Merge branch 'MDL-57432-master' of git://github.com/danpoltawski/moodle 2017-07-11 10:44:06 +02:00
David Monllao
e578ab114c Merge branch 'MDL-59383-master' of git://github.com/lameze/moodle 2017-07-11 10:05:03 +02:00
Simey Lameze
0d38888e2a MDL-59383 core_calendar: make event summary display on modal
Part of MDL-59333.
2017-07-11 15:36:29 +08:00
Simey Lameze
5813d1b9f9 MDL-59383 core_calendar: add get_calendar_event_by_id webservice
Part of MDL-59333.
2017-07-11 15:36:29 +08:00
Simey Lameze
fee9f355bf MDL-59383 core_calendar: add lang strings for event types
Part of MDL-59333.
2017-07-11 15:36:29 +08:00
Simey Lameze
68c3e21a89 MDL-59383 core_calendar: create summary modal templates
Part of MDL-59333.
2017-07-11 15:36:29 +08:00
Simey Lameze
dfdde9ad35 MDL-59383 core_calendar: create summary modal AMD module
Part of MDL-59333.
2017-07-11 15:36:29 +08:00
Simey Lameze
385a56e33c MDL-59383 core_calendar: create calendar repository AMD module
Part of MDL-59333.
2017-07-11 15:36:28 +08:00
Simey Lameze
3b0738f04c MDL-59383 core_calendar: create main calendar AMD module
Part of MDL-59333.
2017-07-11 15:36:28 +08:00
Dan Poltawski
54ef4a9f36 Merge branch 'wip-MDL-40408-master' of git://github.com/marinaglancy/moodle 2017-07-10 14:36:40 +01:00
Dan Poltawski
25a425d709 Merge branch 'wip-MDL-59262-master-2' of git://github.com/marinaglancy/moodle 2017-07-10 14:31:06 +01:00
David Monllao
0245f733b7 Merge branch 'MDL-52501' of https://github.com/NeillM/moodle 2017-07-10 14:38:27 +02:00
Dan Poltawski
bf51478fce Merge branch 'MDL-59317' of https://github.com/NeillM/moodle 2017-07-10 13:28:28 +01:00
David Monllao
bef9a71934 MDL-58851 lti: Fix undefined var PHP notice 2017-07-10 14:26:24 +02:00
David Monllao
7fd09e2471 Merge branch 'lti_admin' of https://github.com/baholladay/moodle 2017-07-10 14:25:24 +02:00
Bryan Holladay
1aa11df72f 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.
2017-07-10 08:19:48 -04:00
David Monllao
4b0518a834 Merge branch 'MDL-58332-master' of git://github.com/ryanwyllie/moodle 2017-07-10 14:19:31 +02:00
Dan Poltawski
f04b6af7d7 Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle 2017-07-10 13:15:21 +01:00
Eloy Lafuente (stronk7)
6248b5ba63 Merge branch 'MDL-59452-master-filetypesbehat' of git://github.com/mudrd8mz/moodle 2017-07-10 12:19:09 +02:00
Dan Poltawski
1a54672fe6 Merge branch 'MDL-58957-master' of https://github.com/sammarshallou/moodle 2017-07-10 11:15:00 +01:00
David Monllao
1d0dd2072c Merge branch 'wip-MDL-56579-master-2' of git://github.com/marinaglancy/moodle 2017-07-10 12:04:14 +02:00
Eloy Lafuente (stronk7)
f83d212bcf 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()
2017-07-10 09:18:56 +01:00
Eloy Lafuente (stronk7)
29af7b0b4c 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.
2017-07-10 09:16:55 +01:00
Dan Poltawski
d18f16032c 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.
2017-07-10 09:16:55 +01:00
Dan Poltawski
8c97a659ce 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
2017-07-10 09:16:55 +01:00
Dan Poltawski
29bbf948a3 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
2017-07-10 09:16:55 +01:00
Dan Poltawski
9a9e061398 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.
2017-07-10 09:16:55 +01:00
Dan Poltawski
64e57937be 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.
2017-07-10 09:16:55 +01:00
Dan Poltawski
04d1f77644 Merge branch 'MDL-58544-master' of git://github.com/damyon/moodle 2017-07-10 08:36:40 +01:00
Eloy Lafuente (stronk7)
2ae3581d63 Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle 2017-07-10 04:25:23 +02:00
Ryan Wyllie
7f805edb38 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.
2017-07-10 02:02:26 +00:00
Jake Dallimore
350700bf8b weekly release 3.4dev 2017-07-07 12:10:12 +08:00
Jake Dallimore
a51401a189 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-07-07 12:10:10 +08:00
Marina Glancy
63470cf31c MDL-59468 theme: bug fix accessing db during install 2017-07-07 11:11:50 +08:00
AMOS bot
cc738fb8b4 Automatically generated installer lang files 2017-07-07 00:06:17 +08:00
Neill Magill
22481f3d89 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.
2017-07-06 15:24:02 +01:00
Neill Magill
733c4978fc 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.
2017-07-06 15:23:40 +01:00
Eloy Lafuente (stronk7)
da120d408c Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle 2017-07-06 15:34:43 +02:00
Mark Nelson
a6a65da4f3 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.
2017-07-06 21:26:02 +08:00
Mark Nelson
272094b8aa 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.
2017-07-06 21:26:02 +08:00
Simey Lameze
b9e9ff8830 MDL-59456 auth_cas: patch phpCAS auth bypass vulnerability 2017-07-06 09:30:53 +01:00
David Mudrák
6b59e4aafb 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.
2017-07-06 09:22:14 +02:00
Jake Dallimore
d5d70e57a4 Merge branch 'MDL-59395_master-fix' of github.com:markn86/moodle 2017-07-06 15:20:41 +08:00
Mark Nelson
7a1c830b0b MDL-59395 core_user: fixed random PHPUnit failure
Part of MDL-59290.
2017-07-06 14:54:41 +08:00
Jake Dallimore
bdbffe0efc Merge branch 'MDL-59364-master-fix2' of http://github.com/damyon/moodle 2017-07-06 14:48:05 +08:00
Damyon Wiese
40f6d24725 MDL-59364 behat: Brief / full links removed
The selector for brief / full user details was removed, it needs removing from the behat test.
2017-07-06 14:37:59 +08:00
Mark Nelson
688892d66f MDL-59395 report_log: fixed step navigating to user profile
Part of MDL-59290.
2017-07-06 13:20:04 +08:00
Jake Dallimore
11f512ee06 Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle 2017-07-06 11:54:48 +08:00
Mark Nelson
661750afc2 MDL-59396 block_participants: removed Behat reference to deleted select
Part of MDL-59290.
2017-07-06 11:17:02 +08:00
David Mudrák
9aabf267ee 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.
2017-07-05 17:38:04 +02:00