0eed941c68
Merge branch 'MDL-65689-36' of git://github.com/rezaies/moodle into MOODLE_36_STABLE
2019-06-04 23:32:30 +02:00
183bce3a77
Merge branch 'MDL-64523-36' of git://github.com/rezaies/moodle into MOODLE_36_STABLE
2019-05-27 10:50:44 +08:00
42ce94472f
MDL-65689 task: fix typo in help string
2019-05-25 05:19:49 +10:00
ec5d9e968a
MDL-64523 core_access: Improve the title of the delete role links
2019-05-25 04:28:05 +10:00
f467121ce0
Merge branch 'MDL-65549_36' of git://github.com/dmonllao/moodle into MOODLE_36_STABLE
2019-05-23 10:11:27 +08:00
d4fe51c7d7
Merge branch 'MDL-65654-36' of https://github.com/danielneis/moodle into MOODLE_36_STABLE
2019-05-23 09:49:01 +08:00
ecc9ffd797
MDL-65654 tool_uploaduser: Fix undefined variable warning
2019-05-21 14:01:24 -03:00
1928283c91
MDL-65549 tool_analytics: Reduce the context name length in models_view
2019-05-21 17:34:51 +02:00
7ad4cd3728
MDL-65067 tool_analytics: Limit update_end_date to format_weeks
2019-05-17 17:01:45 +02:00
ed10f401df
Merge branch 'MDL-65540-36' of git://github.com/andrewnicols/moodle into MOODLE_36_STABLE
2019-05-10 15:58:46 +08:00
4701196ce8
MDL-65540 tool_dataprivacy: Explicit component name in the str helper
2019-05-10 08:07:27 +08:00
ac3f1bdecd
Merge branch 'MDL-29320-36' of git://github.com/junpataleta/moodle into MOODLE_36_STABLE
2019-05-09 19:49:48 +02:00
5d9bf8fe28
Merge branch 'MDL-65141-36' of git://github.com/jleyva/moodle into MOODLE_36_STABLE
2019-05-09 12:27:39 +08:00
a8c51871f4
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:56:47 +02:00
64f1f9ed5a
MDL-65153 competencies: course competencies page
...
The webservice to fetch the data for the course competencies page requires the
pluginbaseurl to be set.
2019-05-07 10:02:29 +08:00
43a538205f
Merge branch 'MDL-65153-36' of git://github.com/damyon/moodle into MOODLE_36_STABLE
2019-05-06 16:13:51 +08:00
3332b5ed21
Merge branch 'MDL-65446-36' of https://github.com/ryanwyllie/moodle into MOODLE_36_STABLE
2019-05-02 15:01:14 +08:00
c74b156127
Merge branch 'MDL-64959_36_STABLE' of https://github.com/abhimanyuZ/moodle into MOODLE_36_STABLE
2019-05-01 14:31:12 +08:00
9c5af7f9ec
MDL-65141 tool_mobile: Return all the language translations
2019-04-30 15:25:39 +02:00
90f26d99ab
MDL-29320 admin: Improve test for multiple accounts with same email
...
* Use Scenario Outlines
* More coverage:
- Test for email case-sensitivity
- Updating user profile as admin
- Updating own user profile
2019-04-30 16:21:25 +08:00
9075a96e5d
MDL-65446 admin: fix admin email option for cli install
2019-04-30 13:35:43 +08:00
6c948829cd
MDL-60418 Behat: Fix missing $installurl
2019-04-25 23:38:58 +02:00
605d3e8d98
Merge branch 'MDL-60418_36' of git://github.com/timhunt/moodle into MOODLE_36_STABLE
2019-04-25 23:26:06 +02:00
ba61f2f91b
MDL-60418 Behat: Fix broken docs links in Behat code.
2019-04-25 21:39:27 +01:00
2327fedbea
MDL-65375 Restore: Null data in other field should be serialised
...
If the 'other' field is empty, then following a restore of course
logs, it should still be serialised so that it is consistent with
the normal behaviour when logging.
Without this change, an event with null value for other has the
field set to NULL if you restore it, but 'N;' when the event is
initially created.
2019-04-18 15:04:18 +01:00
4abab60161
MDL-64959 uploaduser: remove leading/trailing spaces from CSV headings
...
Earlier while uploading users via CSV, if any leading or trailing space was there in
headings of CSV file then error was displayed which will be difficult for a non-technical
person to understand. After this patch, leading and trailing spaces from headings will
be trimmed automatically.
2019-03-23 22:35:51 +05:30
24335e6c2b
MDL-65153 competencies: Urls course competencies
...
The template for the course competencies page expects a pluginbaseurl parameter
but the webservice that fetches when rendered by AJAX is missing this property.
2019-03-22 13:17:56 +08:00
95e75e70b5
MDL-63263 tool_recyclebin: show the note as part of the heading element
...
It looks better (IMO) than using admin_setting_description and works in all
branches.
2019-03-21 00:14:51 +01:00
d86ad34353
Merge branch 'MDL-63263-MOODLE_36_STABLE' of https://github.com/tuanngocnguyen/moodle into MOODLE_36_STABLE
2019-03-20 23:16:09 +01:00
036e58c5b5
Merge branch 'MDL-65005-36-fix' of git://github.com/junpataleta/moodle into MOODLE_36_STABLE
2019-03-20 13:57:17 +08:00
ba7cf5ad88
MDL-65005 tool_policy: Ensure the user's on the Dashboard after agreeing
2019-03-20 13:13:23 +08:00
de8c665fe3
Merge branch 'MDL-64990_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE
2019-03-19 23:05:03 +01:00
23cd28f38c
Merge branch 'MDL-64979-m36' of https://github.com/sammarshallou/moodle into MOODLE_36_STABLE
2019-03-19 22:07:51 +01:00
00c706dc8a
MDL-64979 Behat: Add option to increase timeouts
2019-03-19 17:14:46 +00:00
809901f7c8
Merge branch 'MDL-65006-36' of git://github.com/sarjona/moodle into MOODLE_36_STABLE
2019-03-18 23:35:59 +01:00
01872fd505
Merge branch 'MDL-65218-36' of git://github.com/damyon/moodle into MOODLE_36_STABLE
2019-04-08 16:55:10 +08:00
9cc403d680
Merge branch 'MDL-65094-36' of git://github.com/rezaies/moodle into MOODLE_36_STABLE
2019-04-04 22:38:29 +02:00
49681cd03d
MDL-65218 recycle bin: cover immunization via settings provider
...
Both for course and category recycle bins
2019-04-01 09:26:50 +08:00
cdcc3ab5da
MDL-65218 recycle bin: immunize recycle bin from backup_auto_storage
...
As far as recycle bin is using MODE_AUTOMATED, it observes the backup_auto_storage
setting (storing backups @ real location. For recycle bin we want to ensure that
backup files are always stored in Moodle file area. In order to achieve that, we
hack the setting here via $CFG->forced_plugin_settings, so it won't interfere other
operations. See MDL-65218 for more information.
This hack will be removed once recycle bin switches to use its own backup mode, with
own preferences and 100% appart from MODLE_AUTOMATED.
2019-04-01 09:26:50 +08:00
165baf349b
MDL-65218 recycle bin: Course backups (cat bin) to use MODE_AUTOMATED
...
Surely this should have been done as part of MDL-63263, but it wasn't.
Better let's do it here so every recycle bin backup is using the
very same mode.
2019-04-01 09:26:50 +08:00
abe0e8fbad
MDL-65094 registration: don't encourage registration if on localhost
2019-03-26 17:26:21 +11:00
2bf03fc2e0
Merge branch 'MDL-64615-36' of git://github.com/jleyva/moodle into MOODLE_36_STABLE
2019-03-25 18:20:13 +01:00
47b4f21994
MDL-63263 tool_recyclebin: Apply automated backup setting
...
Use Automated backup settings as settings for Recycle bin backup and restore.
2019-03-15 14:55:08 +11:00
8e6e56c066
MDL-63263 tool_recyclebin: Recycle bin should always save user data.
2019-03-15 14:55:08 +11:00
13898c79db
MDL-46931 roles: retrieve distinct users in sub-query.
...
Prevents duplicate key column warning when a user is enrolled in
a course via multiple enrolment methods.
2019-03-14 01:27:30 +01:00
51ee36d039
MDL-64615 tool_mobile: Do not modify custom download URLs
2019-03-13 17:10:28 +01:00
5806a1f251
MDL-64990 tool_usertours: do not show messaging tour when disabled
2019-03-11 07:50:29 +08:00
ff27e31a89
MDL-65006 policy: avoid loop when no policies need to be agreeded
...
Avoid an infinite loop when the user has no policies to agreed but
the policyagreed = 0.
2019-03-08 10:02:28 +01:00
e389c5cd31
MDL-64971 access: Ensure that the capability exists when fetching
2019-03-06 10:15:55 +08:00
70602491f6
Merge branch 'MDL-64943-36-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_36_STABLE
2019-03-05 11:09:27 +01:00
Eloy Lafuente (stronk7)