12842 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
e747059693 Merge branch 'MDL-58694-master' of git://github.com/jleyva/moodle 2017-06-06 19:34:16 +02:00
Jun Pataleta
c9a3a21c31 Merge branch 'MDL-49398_final4' of https://github.com/sk-unikent/moodle 2017-06-06 12:43:14 +08:00
Dan Poltawski
10cd2bfad3 Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle 2017-06-05 14:54:54 +01:00
sam marshall
03440bcb37 MDL-58567 Upgrade: Show upgrade times 2017-06-02 17:05:35 +01:00
Tony Levi
e705e69e7f
MDL-49398 accesslib: Simplify role definition loading and cache
This change removes the complex and partial loading of role definition data for users.
It is replaced by keeping one system-wide definition for each role in MUC.

This is cheaper to regenerate as it avoids complex database queries (repeated LEFT JOIN to context).
Memory usage is kept low thanks to array CoW for each user access data.
2017-06-02 07:53:23 +01:00
David Mudrák
8cf36e9c81 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.
2017-06-01 09:48:45 +02:00
David Mudrák
e3ad9db6b6 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>
2017-06-01 09:18:38 +02:00
David Mudrák
6c4a5fdf88 MDL-53240 filetypes: Introduce the filetypes_util helper class 2017-06-01 09:18:38 +02:00
Dan Poltawski
31245d8746 Merge branch 'MDL-50266-master' of git://github.com/ankitagarwal/moodle 2017-05-30 10:38:14 +01:00
Jun Pataleta
905ceff28a Merge branch 'MDL-58966-master' of git://github.com/danpoltawski/moodle 2017-05-22 10:47:31 +08:00
Dan Poltawski
b7d26eb3d2 MDL-58966 completion: improve dashboard string 2017-05-18 10:15:08 +01:00
Ankit Agarwal
715d6ba5f7 MDL-50266 core: Remove strings deprecated in 3.0 2017-05-18 11:17:13 +05:30
Ankit Agarwal
b5eff76621 MDL-58929 converters: Make link title consistent 2017-05-15 09:45:09 +05:30
Dan Poltawski
a1c6871bb3 Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle 2017-05-11 14:26:33 +01:00
Marina Glancy
f24e17c93e MDL-58837 course: allow to add multiple sections 2017-05-11 18:48:04 +08:00
Helen Foster
0d86195e8d MDL-58877 lang: Merge English strings from the en_fix language pack
Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix
2017-05-10 12:24:36 +02:00
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Dan Poltawski
2e04d92718 Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle 2017-05-03 11:17:45 +01:00
David Mudrák
31bd102316 MDL-58692 auth: Improve the migration of auth setting names
Some auth plugins used to have a mix of the legacy style of plugin names
in config_plugins table (such as 'auth/mnet') and the new correct
style (such as 'auth_mnet'). Attempting to rename the setting plugin via
low level SQL UPDATE could lead to duplicate key violation.

The patch introduces a new helper function to safely migrate the old
settings to the new ones, eventually informing the admin about the
values mismatch.
2017-05-03 12:02:43 +02:00
Marina Glancy
b7fcd09582 MDL-58635 blogs: check edited blog belongs to current user 2017-05-03 10:49:01 +08:00
Andrew Nicols
d98d245ba0 MDL-58746 core: Simplify environment check 2017-05-03 08:32:24 +08:00
Andrew Nicols
9a2854cc65 MDL-58746 core: Add environment check for finfo 2017-05-01 09:01:21 +08:00
Juan Leyva
bf1babe5ff MDL-58694 admin: Add mobile related data to site registration 2017-04-25 10:30:24 +02:00
Andrew Nicols
442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00
Jake Dallimore
273d310601 MDL-58138 completion: Fixes for a number of small issues. 2017-04-19 11:41:57 +08:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
Marina Glancy
6445f17bfc MDL-58408 completion: can not require grade if grading is not available
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore
22002ed74b MDL-58138 completion: consolidate bulk edit notifications to single call
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore
5976f85c95 MDL-58138 completion: move new lang strings to the completion lang file
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Marina Glancy
7f53e8aa22 MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy
06cdda468a MDL-58139 completion: bulk update completion
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Adrian Greeve
e8a71f8509 MDL-58140 completion: Default completion page.
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Adrian Greeve
0b6208018f MDL-58140 completion: Added bulk activity completion page.
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Jake Dallimore
b54bcddda4 MDL-58190 completion: callbacks to get completion rule descriptions
- Activities can have their custom completion rules added to cm_info
through the get_coursemodule_info callback.
- Descriptions of a modules active completion rules can be fetched using
the component callback mod_xxx_get_completion_active_rule_descriptions
which takes in a cm_info object and returns an array of strings.

Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Dan Poltawski
385e2fc839 Merge branch 'MDL-58526_m33v2' of https://github.com/sbourget/moodle 2017-04-18 19:47:04 +01:00
Eloy Lafuente (stronk7)
9d2112e88d MDL-54901 environment: pg93, openssl, https & utf8mb4 2017-04-18 02:12:45 +02:00
Andrew Nicols
270d5c1cc5 Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle 2017-04-13 10:00:58 +08:00
Andrew Hancox
e9c46768b5 MDL-46929 mod_forum: Fix for edge cases when searching 2017-04-11 08:30:09 +01:00
Stephen Bourget
3ee50231e7 MDL-58526 auth: Improve labels on field mappings 2017-04-09 17:15:33 -04:00
Jonathon Fowler
4044cad5ea MDL-39913 assignsubmission_file: add file types restriction
Testing for uploading a non-permitted file won't work as things stand
currently because the filemanager throws an exception that Behat
catches, which causes a fail.
2017-04-07 16:02:00 +08:00
Jonathon Fowler
4e5a22df7a MDL-39913 filetypes: mimetypes remediation
Going by http://www.iana.org/assignments/media-types/media-types.xhtml.
Disambiguated the Office 2007 types, Apple iWorks and other types
changes by tonyjbutler.
2017-04-07 16:02:00 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Marina Glancy
125c4c4cb8 MDL-57961 course: change wording of module availability
renamed Visible to Availability and added help strings

AMOS BEGIN
 CPY [availability,core_moodle],[modvisible,core_moodle]
 CPY [availability,core_moodle],[modvisiblewithstealth,core_moodle]
 CPY [availability,core_moodle],[modvisiblehiddensection,core_moodle]
 CPY [show,core_moodle],[modshow,core_moodle]
 CPY [hide,core_moodle],[modhide,core_moodle]
AMOS END
2017-04-04 17:05:57 +08:00
Damyon Wiese
bcd08003fa MDL-58220 lang: Add / fix lang strings
The refactoring during integration caused some lang string errors.
2017-04-04 10:28:14 +08:00
Dan Poltawski
3ca68f24f7 Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle 2017-04-03 12:41:56 +01:00
Dan Poltawski
02eaa42f23 Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle 2017-04-03 09:13:55 +01:00
Damyon Wiese
1a1a09d8f8 MDL-58142 calendar: Add an obvious link to the help docs
Part of MDL-58220
2017-04-03 13:40:13 +08:00
Damyon Wiese
151b0f9409 MDL-58132 repositories: Controlled link file type
This introduces a new "controlled link" file type where the file is not
stored in Moodle - but Moodle will control the access permissions on the file.

Plugins can "freeze" a filearea which means Moodle will take ownership of all the remote
files of this type.

When accessing a file, if the "filebrowser" infomation indicates the current user can write to the file, they
will be granted temporary write access.

Part of MDL-58220
2017-04-03 13:40:13 +08:00