641a281bef
Merge branch 'MDL-60942-34' of git://github.com/ryanwyllie/moodle into MOODLE_34_STABLE
2017-12-27 17:56:07 +01:00
829adb5f21
Merge branch 'MDL-43827-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
2017-12-26 00:25:37 +01:00
d1c15a50c9
MDL-43827 filepicker: Multiple actions not accessible using keyboard
2017-12-21 14:08:43 +08:00
b844baf8be
Merge branch 'MDL-61016_hideif_disabledif_34' of git://github.com/davosmith/moodle into MOODLE_34_STABLE
2017-12-19 06:16:23 +01:00
8ed193c3ee
Merge branch 'm34_MDL-60793_Mod_Chat_Reserved_Words_In_MySQL8p0p3_And_Above' of https://github.com/scara/moodle into MOODLE_34_STABLE
2017-12-19 12:13:57 +13:00
aaf94b8f75
Merge branch 'MDL-60653-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE
2017-12-18 17:59:48 +01:00
fb7b0157c1
Merge branch 'wip-MDL-60161-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE
2017-12-18 16:11:47 +01:00
b9287872eb
Merge branch 'wip-MDL-52100-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE
2017-12-18 10:08:21 +01:00
8b448de4b0
MDL-61016 form: fix handling disabledIf + hideIf with same dependency
2017-12-18 08:03:31 +00:00
e8e4566aaa
MDL-52100 filelib: Update to unit tests for maxbytes.
2017-12-18 13:16:43 +08:00
94ccf35860
MDL-52100 filelib: Files that are oversized are checked with user.
...
Files that are oversized could have been uploaded by a user who
can ignore the file size limits. These files should not be deleted
in these situations.
2017-12-18 13:16:14 +08:00
e62e93aa0d
Merge branch 'wip-MDL-49995-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-18 12:01:28 +08:00
de703e70e7
MDL-60793 core_ddl: Added the new MySQL 8 reserved words
2017-12-14 22:58:22 +01:00
3145f21de1
MDL-31436 registration: do not send false in update request
2017-12-14 16:05:45 +13:00
54339683ac
MDL-60161 filelib: Unit test for duplicate curl headers.
2017-12-13 11:13:12 +08:00
65e260281b
MDL-60161 class curl in filelib: Cleaned up doc block.
2017-12-13 11:13:00 +08:00
f29bd28d6a
MDL-60161 class curl in filelib: Avoid duplicate params in http header
2017-12-13 11:12:37 +08:00
4b162c766d
Merge branch 'M3.4-MDL-59866' of https://github.com/marcusboon/moodle into MOODLE_34_STABLE
2017-12-12 13:47:54 +08:00
606c17e6ef
Merge branch 'wip-MDL-56864-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-12 13:39:50 +08:00
daf44482e9
Merge branch 'MDL-44660-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
2017-12-12 12:50:38 +08:00
7da0e04ca3
MDL-59866 session: Add retry for redis sessions
...
There is an edge case whereby redis will fail
to accept connections on the first try but
retrying the connection seems to make it work
Included in this commit:
* Retry functionality in the session init
2017-12-12 14:48:26 +10:00
74af3b176d
MDL-60653 Navigation: Fixed loose string comparison.
...
The previous comparison would sometimes evaluate to true when the
navigation key was not a string.
2017-12-12 12:34:57 +08:00
91406c9103
Merge branch 'MDL-60983_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE
2017-12-12 10:57:55 +08:00
ff383cdd57
Merge branch 'MDL-60968-34' of git://github.com/lameze/moodle into MOODLE_34_STABLE
2017-12-12 10:19:24 +08:00
23e190ead5
MDL-60976 dml: Optimise replace_all_text()
...
Avoid updating fields that do not match the search string.
2017-12-12 10:07:40 +08:00
1daf3fafc0
MDL-60968 auth: Allow more flexibility with mapping attributes
2017-12-12 09:38:20 +08:00
7522b6a2e3
Merge branch 'MDL-60041-m34' of https://github.com/NeillM/moodle into MOODLE_34_STABLE
2017-12-12 09:21:59 +08:00
6924954471
MDL-60041 dml: MOODLELIB sql file must have Unix line endings
...
If the file does not have Unix line endings then the regular expression
in oci_native_moodle_database::attempt_oci_package_install() does
not split it correctly.
This leads to an invalid package being created in Oracle.
The .gitattribute file changes for oci_native_moodle_package.sql
force it to have Unix style line endings when the branch is checked
out and the file does not already exist.
The file has been modified so that the Unix style line endings are
applied even if the file already exists, for example when pulling in
this change to an existing branch.
2017-12-11 08:42:24 +00:00
60e57b8448
Merge branch 'wip-MDL-45500-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-11 13:14:05 +08:00
af9b21a388
Merge branch 'MDL-54106-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
2017-12-11 11:38:04 +08:00
de08d71fc8
Merge branch 'wip-MDL-31436-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-11 11:29:20 +08:00
4846674f5c
MDL-44660 grade: Typos @package core_grade instead of core_grades
2017-12-08 14:21:28 +01:00
ac66136751
MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed
2017-12-08 14:12:49 +01:00
5617f26568
MDL-60983 get_user_capability_course: fix buggy edge cases
...
There were basically two problems, which are demostrated by
the new test users u7 and u8 in the unit test.
1. There was a problem if a role was overridden in a context above the
one where it was assigned. E.g. User has teacher role in a course, and
there is a role override in the course-category context. That was being
ignored.
2. Problems with the handling of PROHIBITs. It should be the case that
if there is a PROHIBIT in force, then it cannot be overridden by another
role, or by a role override. However, this was not working in all cases.
Also, I had to add comments to the unit test so that I could understand
it. Hopefully these will be hepful to other developers too.
2017-12-08 12:07:27 +00:00
e4256cd769
Merge branch 'wip-MDL-60926-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-05 19:03:36 +13:00
5a6a4cef8b
MDL-60443 dataformat lib: Change a wrong variable name
...
The variable $type really is $dataformat. I have changed it for
prevent the error and show a correct error message.
2017-12-05 13:52:36 +08:00
f8979fac97
Merge branch 'MDL-47114-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE
2017-12-05 09:52:42 +08:00
e62ea2b803
Merge branch 'MDL-60925-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
2017-12-04 14:32:00 +13:00
00268741c2
MDL-47114 core: Improved function description
2017-12-02 07:44:27 +08:00
605b0547de
MDL-60926 auth: do not map very long profile fields
2017-12-01 17:51:54 +08:00
eea1aff443
MDL-60942 filters: include filter in format_string cache key
2017-12-01 06:51:58 +00:00
be4ea98f29
MDL-31436 hub: never use xmlrpc, always use REST
2017-11-30 11:27:41 +08:00
845215d826
MDL-60925 theme: Fix SCSS precompilation.
...
There is no point pre-compiling the theme SCSS if it is not stored somewhere that is available
to all webserving nodes. Localcache needs to be backed by the MUC cache.
2017-11-29 17:08:23 +08:00
fe1eb00c0f
MDL-49995 files: delete old file when overwriting
2017-11-28 15:03:29 +08:00
e71a526011
MDL-45500 gradingform: allow plugin uninstall
2017-11-28 12:27:26 +08:00
f3f6960d3e
Merge branch 'MDL-46768-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE
2017-11-28 17:19:00 +13:00
3e2eb62931
Merge branch 'MDL-60188-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE
2017-11-27 15:56:53 +08:00
62104652c8
Merge branch 'MDL-57569-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE
2017-11-27 19:43:57 +13:00
b8e0488c90
MDL-60188 groups: cache user's groups and groupings
...
The function groups_get_user_groups is called too often both before rendering the page and after the page is rendered (using ajax).
The function was executing a query joining 3 tables in each call. The plementation of the function has now modified to store the
query result in a request cache.
2017-11-27 10:42:56 +08:00
47dd1d85aa
MDL-58887 core: fix default title for action menu
...
Thanks to Michelle Melton <meltonml@appstate.edu > for the original
version of this patch.
2017-11-27 01:28:54 +00:00
David Monllao