Commit graph

85961 commits

Author SHA1 Message Date
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
Tobias Reischmann
3a133b3028 MDL-54965 mod_data: removed unused code in display_add_field()
Since the refactoring towards using the filepicker for file and picture
fields there are several variables, which are set but never read. Thus,
I removed them.
2017-07-10 14:14:41 +02:00
Tobias Reischmann
bdf6753528 MDL-54965 mod_data: Init draft area for empty file/pic fields
When a file or picture field was added with existing records, these
records could not be saved, since the draft area was not created
properly.

Co-authored-by: Jérôme Mouneyrac <mouneyrac>
2017-07-10 14:14:41 +02: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
Michael Aherne
8b6dcb0479 MDL-57991 media: Prevent mediaplayer taking up too much space 2017-07-10 10:15:19 +01: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
Adrian Greeve
9ffbdafc95 MDL-59287 calendar_events: Update modules to create all events.
All events equals all calendar events including completion events.
2017-07-10 09:40:02 +08:00
Adrian Greeve
a85e191c4d 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.
2017-07-10 09:40:02 +08:00
Adrian Greeve
e3658a6a9c MDL-59287 course_module: Create calendar event update function. 2017-07-10 09:40:02 +08:00
Adrian Greeve
190d4ecf1e MDL-59287 core_completion: Bulk completion now updates events. 2017-07-10 09:40:02 +08:00
Adrian Greeve
190646bd75 MDL-59287 core_completion: Update to unit tests. 2017-07-10 09:40:02 +08:00
Adrian Greeve
1930749f46 MDL-59287 core_completion: Update API to use less DB calls. 2017-07-10 09:40:01 +08:00
Stephen Vickers
d7d8db95e9 MDL-59485 mod_lti: Add missing capabilities
Capabilities missing which should allow Moodle to pass IMS certification
for LTI 2.0
2017-07-08 12:39:02 +01:00
AMOS bot
7e6d2ac436 Automatically generated installer lang files 2017-07-08 00:15:42 +08: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
Dan Marsden
e63d7244a6 MDL-58863 scorm: Improve accessibility when css disabled. 2017-07-07 10:40:13 +12: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
David Mudrák
fd8fe9c1db MDL-56486 workshop: Add behat tests for restricting file types 2017-07-06 12:31:26 +02:00
Simey Lameze
b9e9ff8830 MDL-59456 auth_cas: patch phpCAS auth bypass vulnerability 2017-07-06 09:30:53 +01:00
David Mudrák
b8b07ce2c4 MDL-56486 workshop: Deprecate custom methods for handling file types
The functionality and the tests are now part of the core element.
2017-07-06 09:49:04 +02:00
David Mudrák
9ef238bc84 MDL-56486 workshop: Use filetypes utility class to normalize file types 2017-07-06 09:49:04 +02:00
David Mudrák
5a0865a1b1 MDL-56486 workshop: Use filetypes utility class to check submitted files 2017-07-06 09:49:04 +02:00
David Mudrák
f9a8d98047 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.
2017-07-06 09:49:04 +02:00
David Mudrák
ee7e8fdf8e MDL-59443 forms: Add behat tests for the field validation 2017-07-06 09:29:04 +02:00