Eloy Lafuente (stronk7)
a649a3a120
Merge branch 'MDL-62714-boost_course_visibility_in_navbar' of https://github.com/fskandalis/moodle
2018-09-25 23:17:52 +02:00
Eloy Lafuente (stronk7)
de7c685e52
Merge branch 'MDL-63253-master-adminsearchresults' of git://github.com/mudrd8mz/moodle
2018-09-25 22:56:11 +02:00
Eloy Lafuente (stronk7)
0ddc272116
Merge branch 'MDL-62334-master' of https://github.com/danielneis/moodle
2018-09-25 22:50:41 +02:00
Daniel Neis Araujo
28af88f364
MDL-62334 admin: add a new course link on admin/search
2018-09-25 14:31:50 -03:00
Eloy Lafuente (stronk7)
b687205e27
Merge branch 'MDL-60028' of https://github.com/paulholden/moodle
2018-09-25 16:57:58 +02:00
Eloy Lafuente (stronk7)
b8749c6208
Merge branch 'wip-MDL-62708-master' of https://github.com/Beedell/moodle
2018-09-25 16:52:50 +02:00
Eloy Lafuente (stronk7)
fc008d6769
MDL-57610 assignfeedback_editpdf: add missing UK to install.xml
2018-09-25 15:21:42 +02:00
Eloy Lafuente (stronk7)
4f06a97702
Merge branch 'MDL-57610' of git://github.com/aolley/moodle
2018-09-25 14:46:09 +02:00
David Monllao
8199e69b47
Merge branch 'MDL-63119-master' of git://github.com/lameze/moodle
2018-09-25 12:36:08 +02:00
David Monllao
cebb7ba17c
Merge branch 'MDL-62930-master' of git://github.com/damyon/moodle
2018-09-25 12:28:10 +02:00
David Monllao
9d4c8d45ef
Merge branch 'MDL-62717-master' of https://github.com/lucaboesch/moodle
2018-09-25 12:18:36 +02:00
David Monllao
85d4b77cd3
Merge branch 'MDL-61967-master' of git://github.com/sarjona/moodle
2018-09-25 11:08:53 +02:00
Andrew Nicols
1a9fc39277
Merge branch 'MDL-63346' of https://github.com/stronk7/moodle
2018-09-25 08:35:08 +08:00
Adam Olley
1afbb97b6b
MDL-57610 assignfeedback_editpdf: integration cleanup
...
* Add a note to upgrade.php to notify devs/admins of the new setting.
* Replace update_record with set_field.
* Add missing phpdoc.
2018-09-25 09:54:39 +09:30
Sara Arjona
5290d0604b
MDL-61967 core_user: Allow filtering by No groups on participants page
...
A new optional parameter $context has been added to the
core_group::groups_get_members_join() function.
Besides, some core_group methods now accept -1 (USERSWITHOUTHGROUP) for
the groupid field.
2018-09-24 18:33:45 +02:00
Eloy Lafuente (stronk7)
0de29dbf35
MDL-63020 tests: ensure that searching for is null values also works ok
2018-09-24 17:38:10 +02:00
Eloy Lafuente (stronk7)
985b6b75c2
Merge branch 'MDL-63020' of git://github.com/timhunt/moodle
2018-09-24 16:01:21 +02:00
Tim Hunt
eb6c769a8c
MDL-63020 dml: improve the unit tests
2018-09-24 11:41:25 +01:00
David Monllao
bac1731614
Merge branch 'MDL-61573-master' of https://github.com/Kathrin84/moodle
2018-09-24 11:24:49 +02:00
John Beedell
dfa85ad002
MDL-62708 qformat_xml: phpunit test correction.
2018-09-24 09:37:12 +01:00
David Monllao
6ef77520cd
MDL-47962 upgrade.txt: Update commit reference
2018-09-24 09:50:05 +02:00
David Monllao
ccff34bf07
Merge branch 'MDL-47962' of git://github.com/timhunt/moodle
2018-09-24 09:45:47 +02:00
David Monllao
bdc511364c
MDL-54035 upgrade.txt: Limit comments to relevant info for upgrades
2018-09-24 09:41:18 +02:00
Jonathan Champ
d2a98f89bd
MDL-54035 course: Test reset roles in reset_course_userdata()
...
Previously, reset_course_userdata() was deleting the role_capabilities
directly, but has_capability() checks the local capabilities cache
which was still returning the previous value.
2018-09-21 09:17:43 -04:00
Jonathan Champ
1113e34675
MDL-54035 accesslib: Add context->get_parent_context_paths()
...
Returns full context paths for parent contexts. Useful for exact
matches, such as when checking dirtycontexts.
2018-09-21 09:17:43 -04:00
Jonathan Champ
1d049e08e5
MDL-54035 accesslib: add mark_user_dirty helper
...
Instead of marking an entire context dirty and affecting all users
of those contexts, mark the user as dirty when the change only
affects that user.
2018-09-21 09:17:43 -04:00
Jonathan Champ
34dd57053d
MDL-54035 accesslib: only modify role_capabilities in accesslib
...
Whenever the role_capabilities table is changed, we need to remember
to clear the cache for the role(s) being modified. This is far simpler
when all of those changes happen in a single file, i.e. accesslib.php,
allowing other parts of the application to use the public functions
without requiring knowledge of the cache internals.
2018-09-21 09:17:43 -04:00
Jonathan Champ
b2f349a433
MDL-54035 accesslib: separate role definition cache clear
...
Thanks to MDL-49398, we can separate the combined user session and role
definition cache clearing function into two separate functions. At the
same time, we want to identify and remove mark_dirty() calls that were
added for role definition changes but were incorrectly left behind.
Change highlights:
- Remove unnecessary mark_dirty() calls performed after
assign_capability(), unassign_capability(), delete_role(),
deleted contexts, brand new contexts
- Move role definition cache clear from the user-centric
accesslib_clear_all_caches() to the newly created,
role-dedicated accesslib_reset_role_cache()
2018-09-21 09:17:42 -04:00
John Beedell
6189fda47f
MDL-62708 question: Add idnumbers to question and question category
2018-09-21 12:26:24 +01:00
Paul Holden
f56e695883
MDL-60028 enrol: fix counting of enrolled users in a given context.
...
Previously users enrolled in a course via multiple enrolment methods
would be counted multiple times.
2018-09-21 10:14:55 +01:00
Tim Hunt
3923151a1a
MDL-47962 filter_glossary: changes made during integration review
2018-09-20 17:58:01 +01:00
Tim Hunt
5a8c44d000
MDL-47962 filter_glossary: only create replacement HTML if needed
2018-09-20 17:58:01 +01:00
Tim Hunt
1d8d00d91d
MDL-47962 filter_glossary: only prepare the replacement if used
2018-09-20 17:58:00 +01:00
Tim Hunt
ac66652078
MDL-47962 filter_glossary: clean up filterobject class
...
This is another preliminary commit, rationalising the ->work... fields
and also moving the code that sets them up into a separate function.
This is also to prepare for the next commit.
2018-09-20 17:58:00 +01:00
Tim Hunt
c01503de75
MDL-47962 filter_glossary: only prepare_phrases_for_filtering once
2018-09-20 17:58:00 +01:00
Tim Hunt
2abf8fbf86
MDL-47962 filter_glossary: use preg features for fullmatch
...
This eliminates a lot of necessary string manipulation for something
that preg can just do with the \b assertion.
The change also extracts all the work to prepare ->work_phrase (renamed
->regexp) into a separate function. This is to pave the way for future
efficiency gains, but for now I have not done them, so it is easier to
verify by inspection that this commit does not change behaviour.
Also, some tidy-ups to the filterobject structure, to eliminate some
redundant fields.
2018-09-20 17:58:00 +01:00
Tim Hunt
d22699af7f
MDL-47962 filter_glossary: cache concept list in a MUC static cache
...
This is a slight improvement on a suggestion by David Monllaó
2018-09-20 17:58:00 +01:00
Tim Hunt
b0a3b52fe9
MDL-47962 filter_glossary: Fix lang string concatenation
2018-09-20 17:58:00 +01:00
Tim Hunt
c633345265
MDL-47962 filter_glossary: $GLOSSARY_EXCLUDEENTRY shouldn't stop caching
...
Also, greatly improved unit tests, to test more cases of how the filter
should work.
2018-09-20 17:58:00 +01:00
Tim Hunt
43d270e4ef
MDL-47962 filterlib: Fix lots of coding style
2018-09-20 17:58:00 +01:00
Tim Hunt
5abc431335
MDL-63020 ddl: fix nullable unique indexes in OCI and MS SQL
...
This works-around the default non-standard behaviour of these DB engines.
2018-09-20 17:41:22 +01:00
Tim Hunt
54b2b1d27f
MDL-63020 xmldb: Improve PHPdoc comments for better IDE autocomplete
2018-09-20 17:41:22 +01:00
Luca Bösch
490476a118
MDL-62717 forum: Create announcements forum with HTML format intro.
2018-09-20 17:47:35 +02:00
Eloy Lafuente (stronk7)
6902f39141
weekly release 3.6dev
2018-09-20 12:11:53 +02:00
Eloy Lafuente (stronk7)
ef10e7db4c
MDL-63346 nodejs: Bump to created from scratch shrinkwrap file
...
Steps:
- remove node_modules & npm-shrinkwrap.json
- npm cache clear --force
- npm install
- npm shrinkwrap
2018-09-20 11:00:02 +02:00
Eloy Lafuente (stronk7)
5bd0dc6483
MDL-23545 question: fix remaining sizes leading to failures
2018-09-19 23:07:20 +02:00
Eloy Lafuente (stronk7)
881f451bf0
Merge branch 'MDL-23545-phpunit-fixes' of https://github.com/timhunt/moodle
2018-09-19 18:10:37 +02:00
Eloy Lafuente (stronk7)
dd3508df5b
MDL-59227 course: Use low level early renaming to avoid dupes
...
Instead of using set_coursemodule_name() to proceed with the name
change we perform the change earlier in the process, both to avoid
duplicate events caused by the renaming function and also to get the new
name used by all proper generated events.
2018-09-19 17:20:23 +02:00
David Monllao
4453613767
Merge branch 'MDL-63140-master' of git://github.com/rezaies/moodle
2018-09-19 13:30:43 +02:00
Tim Hunt
59ffae414c
MDL-23545 qformat_xml: fix another Behat test
2018-09-19 12:18:59 +01:00