Commit graph

2920 commits

Author SHA1 Message Date
Adrian Greeve
a8d20b0fa9 Merge branch 'MDL-65549_master' of git://github.com/dmonllao/moodle 2019-05-23 10:09:09 +08:00
Andrew Nicols
aec03b8c0a Merge branch 'MDL-65654-master' of https://github.com/danielneis/moodle 2019-05-23 09:35:17 +08:00
Adrian Greeve
467af62e35 Merge branch 'MDL-65067_master' of https://github.com/dmonllao/moodle 2019-05-22 16:29:52 +08:00
Andrew Nicols
97d791bf3a Merge branch 'MDL-65590-master' of git://github.com/rezaies/moodle 2019-05-22 13:52:14 +08:00
Jun Pataleta
f8a6990a46 Merge branch 'MDL-65591-master' of git://github.com/rezaies/moodle 2019-05-22 11:06:31 +08:00
David Monllaó
8d19264bc0 MDL-65549 tool_analytics: Reduce the context name length in models_view 2019-05-21 17:26:22 +02:00
Shamim Rezaie
26206ddc78 MDL-65590 tool_customlang: Escape html on the standard text field 2019-05-21 14:20:16 +10:00
Eloy Lafuente (stronk7)
3572a25cc3 MDL-65644 upgrade: add 3.7.0 separation line to all upgrade scripts 2019-05-20 19:35:05 +02:00
Shamim Rezaie
1806f70cbb MDL-65591 tool_customlang: Re-adding the save buttons at the bottom 2019-05-21 02:20:20 +10:00
Daniel Neis Araujo
3cbec0b81a MDL-65654 tool_uploaduser: Fix undefined variable warning 2019-05-20 12:44:05 -03:00
David Monllaó
a9db4f903d MDL-65067 tool_analytics: Limit update_end_date to format_weeks 2019-05-17 16:57:46 +02:00
Jun Pataleta
64d680c271 Merge branch 'MDL-65583_master' of git://github.com/dmonllao/moodle 2019-05-15 15:57:05 +08:00
David Monllaó
a1fb183df0 MDL-65583 tool_analytics: Model name from a data attribute
The credit and the patch using this approach goes to David Mudrák.
2019-05-13 22:54:28 +02:00
Eloy Lafuente (stronk7)
c9a1a6341c MDL-65571 versions: bump all versions and requires near release
version = 2019052000 release version
requires= 2019051100 current beta (week6roll2) version
2019-05-12 23:46:34 +02:00
Jun Pataleta
f49c1dcd4a Merge branch 'MDL-65540-master' of git://github.com/andrewnicols/moodle 2019-05-10 15:59:16 +08:00
Eloy Lafuente (stronk7)
08d40829e9 Merge branch 'MDL-65423-master' of git://github.com/jleyva/moodle 2019-05-09 21:48:26 +02:00
Shamim Rezaie
9902e215a9 MDL-65540 tool_dataprivacy: Explicit component name in the str helper 2019-05-09 15:24:50 +08:00
Jun Pataleta
f32b6961c9 Merge branch 'MDL-65141-master' of git://github.com/jleyva/moodle 2019-05-09 12:29:25 +08:00
Michael Hawkins
cbe5c5fed4 MDL-61738 messageinbound: Fix quota checks & filesize for email uploads
Private files uploaded by email will now honour the file quota limit,
because the filesize is set correctly and checked against users'
remaining personal quota limit. Previously, attachment size was always
set to zero, and quota was checked against the draft area (this is
not valid for email uploads, because each file is moved out of the
draft area as it is processed, so multiple files totalling greater
than the remaining quota would still pass the check).
2019-05-08 17:54:44 +02:00
Mathew May
a282fc23ea MDL-44484 admin: Remove existing user theme check 2019-05-08 16:14:26 +12:00
Jun Pataleta
6861c4f06e Merge branch 'MDL-44484-master' of https://github.com/Chocolate-lightning/moodle 2019-05-08 10:53:37 +08:00
Mathew May
e6ce167bb7 MDL-44484 admin: Theme can be null and create user 2019-05-08 14:44:30 +12:00
Eloy Lafuente (stronk7)
9b0aec2d65 MDL-65154 competencies: FF 47 does not digest null/missing JS params
So we are defaulting to 0 when the page is initially called,
instead of current null. That's exactly the same behavior
than when you pick "No filters applied" from the filter menu.

Note that other browsers seems to accept perfectly the missing param
but FF 47.0.1 does not.
2019-05-07 23:20:38 +02:00
Jun Pataleta
6498f438a5 Merge branch 'MDL-65153-master' of git://github.com/damyon/moodle 2019-05-07 16:24:37 +08:00
Daniel Neis Araujo
09df597597 MDL-44484 admin: Allow theme field in upload users tool 2019-05-07 12:17:05 +12:00
Damyon Wiese
89da9b4900 MDL-65154 competencies: Filter course competencies
Add an activity filter to the course competencies screen.
2019-05-06 09:34:25 +08:00
Jun Pataleta
70cbc37755 Merge branch 'MDL-52828-master' of git://github.com/damyon/moodle 2019-05-03 10:59:42 +08:00
Eloy Lafuente (stronk7)
550778cdb6 Merge branch 'MDL-65459-master' of https://github.com/sammarshallou/moodle 2019-05-02 00:24:46 +02:00
sam marshall
ef3f92c70a MDL-65459 Logging: Missed two points relying on non-JSON log format 2019-05-01 12:11:17 +01:00
Adrian Greeve
53c792b119 Merge branch 'MDL-64959_master' of https://github.com/abhimanyuZ/moodle 2019-05-01 14:30:00 +08:00
Damyon Wiese
27737ae666 MDL-52828 competencies: Filter by activity
On the competency breakdown report, allow filter by competencies linked to an activity.
2019-05-01 09:58:22 +08:00
Juan Leyva
8c5850a501 MDL-65141 tool_mobile: Return all the language translations 2019-04-30 14:30:51 +02:00
Juan Leyva
f72a482843 MDL-65423 tool_mobile: Fix incorrect option value 2019-04-30 13:38:38 +02:00
David Mudrák
234b37046f MDL-65397 lang: Use the new strings in Behat scenarios 2019-04-29 11:47:10 +02:00
Helen Foster
f1264719f4 MDL-65397 lang: Import fixed English strings (en_fix)
Significant string changes:

* direct:view,gradeimport_direct - wording corrected from 'CSV' to
  'spreadsheet'
* limitanswers_help,mod_choice - additional wording added explaining how
  the setting works with groups
* pluginname,customfield_text  - 'Text field' plugin renamed to
  'Short text'
2019-04-29 11:46:26 +02:00
Eloy Lafuente (stronk7)
c495b17c5f MDL-60418 Behat: Fix missing $installurl 2019-04-25 23:38:01 +02:00
Eloy Lafuente (stronk7)
c080369cb9 Merge branch 'MDL-60418' of git://github.com/timhunt/moodle 2019-04-25 23:25:51 +02:00
Tim Hunt
d1ac356a8b MDL-60418 Behat: Fix broken docs links in Behat code. 2019-04-25 21:32:48 +01:00
David Monllaó
45c8b226be Merge branch 'MDL-64782-master' of git://github.com/rezaies/moodle 2019-04-24 17:37:45 +02:00
Adrian Greeve
082740b7c6 Merge branch 'MDL-65375-master' of https://github.com/sammarshallou/moodle 2019-04-24 10:28:29 +08:00
Eloy Lafuente (stronk7)
fc8a72b4cb Merge branch 'MDL-65382-master' of git://github.com/junpataleta/moodle 2019-04-24 00:04:45 +02:00
Eloy Lafuente (stronk7)
0d575a542a Merge branch 'MDL-65248_master' of git://github.com/dmonllao/moodle 2019-04-23 13:50:22 +02:00
David Monllaó
2f3c8da164 Merge branch 'MDL-61199-master' of git://github.com/jleyva/moodle 2019-04-23 13:44:04 +02:00
Eloy Lafuente (stronk7)
735122c33f Merge branch 'MDL-64641-master' of git://github.com/jleyva/moodle 2019-04-23 13:43:56 +02:00
David Monllaó
1986293d78 Merge branch 'MDL-65251-master' of git://github.com/junpataleta/moodle 2019-04-23 13:42:30 +02:00
Shamim Rezaie
acb25c6534 MDL-64782 tool_monitor: Performance improvement 2019-04-23 17:01:48 +10:00
Eloy Lafuente (stronk7)
65c6deca6f Merge branch 'MDL-65378_master' of git://github.com/dmonllao/moodle 2019-04-22 01:03:34 +02:00
sam marshall
7e604b418e MDL-65375 Restore: Log restore must support new jsonformat setting
Includes support for the new jsonformat setting in logstore_standard
and logstore_database.

Also includes a bugfix where the restore used to restore NULL into
'other' fields, which were not null otherwise, so it was inconsistent
with normal logging.
2019-04-18 16:07:01 +01:00
Jun Pataleta
a0653e5c4a MDL-65382 tool_dataprivacy: Fix appearance of status labels 2019-04-18 15:29:07 +08:00
David Monllaó
acaf0977a8 MDL-65378 tool_analytics: Add missing require 2019-04-17 13:56:04 +02:00