641a281bef
Merge branch 'MDL-60942-34' of git://github.com/ryanwyllie/moodle into MOODLE_34_STABLE
2017-12-27 17:56:07 +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
e8e4566aaa
MDL-52100 filelib: Update to unit tests for maxbytes.
2017-12-18 13:16:43 +08:00
54339683ac
MDL-60161 filelib: Unit test for duplicate curl headers.
2017-12-13 11:13:12 +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
4846674f5c
MDL-44660 grade: Typos @package core_grade instead of core_grades
2017-12-08 14:21:28 +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
eea1aff443
MDL-60942 filters: include filter in format_string cache key
2017-12-01 06:51:58 +00:00
144c9ba7c3
Merge branch 'MDL-60526-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
2017-11-20 13:44:02 +01:00
44b87b5d95
MDL-60436 blocks: Unit test for dashboard block positioning
2017-11-17 14:11:01 +00:00
e7b4c991ee
MDL-60526 forms: Prevent duplicate type attributes
...
The exporter for mform elements does not skip "type" (which is included as a separate value).
2017-11-15 11:54:21 +08:00
796e48a58b
MDL-60611 phpunit: remove deprecated stuff and other minor fixes
...
Thanks @scara for MDL-60611 phpunit: improved redis skipping reasons
2017-11-05 01:45:04 +01:00
801a372dad
MDL-60611 phpunit: switch to namespaced phunit classes
2017-11-02 23:45:34 +01:00
141c4adbb6
Merge branch 'MDL-42834_master' of git://github.com/markn86/moodle
2017-10-23 13:25:35 +08:00
672f483670
MDL-42834 admin: Removal of httpswwwroot
2017-10-23 12:25:36 +08:00
b58764ff99
MDL-42834 admin: Remove loginhttps
2017-10-23 12:25:35 +08:00
b01232671e
Merge branch 'MDL-60388_master' of git://github.com/dmonllao/moodle
2017-10-23 10:00:41 +08:00
6e98bca0ba
MDL-60388 analytics: Any write action looking at all contexts below course
2017-10-20 13:20:46 +02:00
0a1a56307b
Merge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle
2017-10-19 10:51:59 +02:00
ebc993b8c5
Merge branch 'wip-MDL-60335-master' of git://github.com/marinaglancy/moodle
2017-10-19 15:39:56 +13:00
de316e8e3b
MDL-60469 behat: Replace I press with I click on
2017-10-19 10:37:59 +08:00
b1a9a6a19a
Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle
2017-10-17 09:45:44 +02:00
bd39ef2422
MDL-60335 admin: fix encoding of nonlatin site names in blocked hosts
2017-10-17 12:44:13 +08:00
ebb4244bf4
Merge branch 'wip-MDL-60337-master' of git://github.com/marinaglancy/moodle
2017-10-16 15:40:44 +08:00
5be8c8daa6
Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle
2017-10-16 12:10:51 +08:00
d28eb51ddc
MDL-60281 general: remove class object() completely
...
This class was deprecated under MDL-52471 and was showing debugging notice from Moodle 3.0.1
In PHP7.2 the class declaration fails with fatal error even if it's not used anywhere
2017-10-16 09:37:20 +08:00
f4594a22ec
Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2017-10-10 17:32:47 +08:00
8fbc41d8d5
MDL-37361 completion: minor code fixes.
2017-10-10 17:12:09 +08:00
86f359bf68
MDL-37361 completion: automatic completion disabled when overridden
...
Changes:
- Activities with auto completion and a completion status overridden to
COMPLETION_COMPLETE are no longer processed by normal completion
triggers.
- All activities can still be completed by students when their
completion status has been overridden to COMPLETION_INCOMPLETE, via
either auto or manual triggers.
- Completion unit tests updated
2017-10-10 17:10:49 +08:00
60a6b36cd5
MDL-37361 completion: Modified and Added phpunit tests
2017-10-10 17:10:37 +08:00
a475e0fe79
MDL-45730 core: added unit tests for new events
2017-10-10 13:15:18 +08:00
46f7b264a3
MDL-59897 Accesslib: get_user_capability_course is slow
2017-10-06 13:57:55 +01:00
48a3a50aa4
MDL-59890 behat: Revert to checking if isset instead of not empty
...
Reverting changes made by commit
1957d33996
2017-10-04 14:24:15 +08:00
cd7cd9d9c1
Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle
2017-10-04 11:19:33 +08:00
1957d33996
MDL-59890 behat: Check empty not isset for switchids
2017-10-04 11:16:06 +08:00
fb3c0fc38b
MDL-59890 calendar: Allow event creation in behat
2017-10-04 11:16:06 +08:00
e092ec3117
Merge branch 'MDL-33174-master' of https://github.com/matt-catalyst/moodle
2017-10-03 23:01:45 +02:00
4536f3084d
Merge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle
2017-10-03 22:38:13 +02:00
e9321ad07d
MDL-59890 coursecat: Add helper to fetch nested view of coursecat
2017-10-03 21:28:31 +08:00
a3cc6261fc
MDL-60337 htmlpurifier: non-ascii domain names
2017-10-03 18:57:11 +08:00
2a1275479c
MDL-60239 libraries: patch Markdown for PHP7.2
2017-10-02 15:32:11 +08:00
7c1177649d
MDL-58548 lib: Update to moodle specific files.
...
Update to moodle specific files related to the upgrade
of htmlpurifier.
2017-10-02 08:19:40 +08:00
b1eb6dd7f2
MDL-33174 lib/filestorage: Add filename to curl request
...
While the lack of the filename in curl POST does not
directly affect Moodle, some external API's expect to get
the filename of the original file, which affects plugins
using the CURL class.
2017-10-02 09:27:51 +13:00
b7e9f1cc42
MDL-37810 roles: fix profile roles logic to include all roles
...
If the user has the role:assign capability then the list of profile roles
will include any role assigned in the context or above.
2017-09-21 22:23:41 +08:00
708100cbef
Merge branch 'MDL-59277-master' of https://github.com/snake/moodle
2017-09-19 09:48:30 +01:00
434d138c2a
MDL-37810 roles: added manager case to test_get_user_roles_in_course()
...
Managers can assign managers, and should be able to see that role on
the course profile page, as a link to the participants page.
2017-09-18 10:16:08 +08:00
5d0cc05b20
MDL-59277 navigation: add support for container type in get_css_type()
2017-09-18 09:03:51 +08:00
42a2c4794d
MDL-37810 roles: unit tests for get_profile_roles()
2017-09-18 08:59:29 +08:00
7e4c4b6f1f
MDL-59084 core: Allow adhoc tasks to run as a specified user
2017-09-12 21:58:50 +08:00
44e1928532
Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle
2017-09-07 10:50:16 +02:00
David Monllao