moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
90678 commits 37 branches 544 tags 1.3 GiB
Commit graph

90678 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
1a1d03caeb weekly release 3.5.2+ 2018-10-19 17:10:56 +02:00
Eloy Lafuente (stronk7)
7e3eaa5d6f Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE 2018-10-19 17:10:54 +02:00
AMOS bot
512091f40c Automatically generated installer lang files 2018-10-19 00:08:10 +00:00
Eloy Lafuente (stronk7)
722f0c03c0 Merge branch 'MDL-62920_35' of https://github.com/aanabit/moodle into MOODLE_35_STABLE 2018-10-18 23:51:47 +02:00
Eloy Lafuente (stronk7)
892e441634 Merge branch 'MDL-60145-35' of https://github.com/snake/moodle into MOODLE_35_STABLE 2018-10-18 18:57:45 +02:00
Tim Hunt
e24dfc1a07 MDL-63403 filter_glossary: changes made during integration review 2018-10-18 18:46:41 +02:00
Tim Hunt
44d00da135 MDL-63403 filter_glossary: only create replacement HTML if needed 2018-10-18 18:41:42 +02:00
Tim Hunt
de736d0c84 MDL-63403 filter_glossary: only prepare the replacement if used 2018-10-18 18:41:38 +02:00
Tim Hunt
e78bd0cefb MDL-63403 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-10-18 18:41:34 +02:00
Tim Hunt
e208669c64 MDL-63403 filter_glossary: only prepare_phrases_for_filtering once 2018-10-18 18:41:30 +02:00
Tim Hunt
098d616a30 MDL-63403 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-10-18 18:41:26 +02:00
Tim Hunt
995d434de1 MDL-63403 filter_glossary: cache concept list in a MUC static cache 
This is a slight improvement on a suggestion by David Monllaó
 2018-10-18 18:41:22 +02:00
Tim Hunt
366a85cbb4 MDL-63403 filter_glossary: Fix lang string concatenation 2018-10-18 18:41:18 +02:00
Tim Hunt
0c94037196 MDL-63403 filter_glossary: $GLOSSARY_EXCLUDEENTRY shouldn't stop caching 
Also, greatly improved unit tests, to test more cases of how the filter
should work.
 2018-10-18 18:41:14 +02:00
Tim Hunt
fa0a861400 MDL-63403 filterlib: Fix lots of coding style 2018-10-18 18:40:50 +02:00
Jun Pataleta
068c66f242 Merge branch 'MDL-63667-35-fix2' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2018-10-18 14:38:26 +08:00
Andrew Nicols
b26c30d8f9 MDL-63667 amd: Check for parent template recursion 2018-10-18 12:11:52 +08:00
Damyon Wiese
ac1c36c728 MDL-63667 output: Fix for recursive templates 
A template can include itself - e.g. by looping over the context children and rendering a tree.

Ensure this promise still resolves.

Example: admin/tool/lp/templates/competencies_tree.mustache.
 2018-10-18 10:52:06 +08:00
Eloy Lafuente (stronk7)
069dfe5fc3 Merge branch 'MDL-63632-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-10-18 02:39:24 +02:00
AMOS bot
b1904ba9cb Automatically generated installer lang files 2018-10-18 00:07:26 +00:00
Andrew Nicols
951ae21309 MDL-63632 forum: Delete where not discussion author 2018-10-18 07:20:29 +08:00
Eloy Lafuente (stronk7)
b55b2e4f6e Merge branch 'MDL-63068_35' of https://github.com/aanabit/moodle into MOODLE_35_STABLE 2018-10-18 00:39:55 +02:00
Jun Pataleta
b7d2f7e1d4 MDL-62904 tool_dataprivacy: Add data request links in profile page 2018-10-17 16:43:31 +08:00
Jun Pataleta
d4a5339029 Merge branch 'MDL-63667-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2018-10-17 15:06:01 +08:00
Ryan Wyllie
6185c3455a MDL-63667 javascript: fix failed to pre-fetch the template error 2018-10-17 13:53:20 +08:00
Michael Hawkins
44b012e5fd MDL-63495 comment: Added provider::delete_comments_for_users 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
b8558f33aa MDL-63495 mod_forum: Add intial support for removal of multiple context users 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
9674218469 MDL-63495 core_rating: Add helper to fetch users in context 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
e3ddf1e324 MDL-63496 tool_dataprivacy: Add configuration for per-role retention 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
f30b061f48 MDL-63496 tool_dataprivacy: Respect expiry with protected flag 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
7f7e78269f MDL-63496 tool_dataprivacy: Support for per-role retention 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Michael Hawkins
744ee9322c MDL-63497 tool_dataprivacy: Add support for removal of context users 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Andrew Nicols
bdf43538fb MDL-63495 privacy: Add support for removal of multiple users in a context 
This issue is a part of the MDL-62560 Epic.
 2018-10-17 13:13:49 +08:00
Eloy Lafuente (stronk7)
0bf20c560e weekly release 3.5.2+ 2018-10-16 16:05:38 +02:00
Damyon Wiese
7817df3048 Merge branch 'MDL-62960-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2018-10-16 11:43:53 +08:00
Shamim Rezaie
8baf412ef7 MDL-62960 calendar: Visuall indicator for valid course event drop zones 2018-10-16 13:09:33 +11:00
Shamim Rezaie
86eff20271 MDL-62960 calendar: Rename get_module_timestamp_min/max_limit methods 
The methods get_module_timestamp_min_limit() and get_module_timestamp_max_limit()
are doing generic stuff and can be used for other calendar event types as well.
I have renamed them to get_timestamp_min_limit() and get_timestamp_max_limit() respectively.
 2018-10-16 13:09:26 +11:00
Shamim Rezaie
81e11e98f7 MDL-62960 calendar: Implementing course events validity check callback 2018-10-16 13:04:05 +11:00
Shamim Rezaie
4dee91aabf MDL-62960 calendar: Added range check callback for course events 
Added core_calendar_get_valid_event_timestart_range callback for course events
 2018-10-16 13:04:05 +11:00
Andrew Nicols
5c74c84c9d Merge branch 'MDL-63421_35' of git://github.com/stronk7/moodle into MOODLE_35_STABLE 2018-10-16 08:50:22 +08:00
Eloy Lafuente (stronk7)
8c682cd317 Merge branch 'MDL-63583-35' of git://github.com/jleyva/moodle into MOODLE_35_STABLE 2018-10-16 00:29:09 +02:00
Eloy Lafuente (stronk7)
0603eabe6e Merge branch 'MDL-63456-35' of git://github.com/merrill-oakland/moodle into MOODLE_35_STABLE 2018-10-16 00:17:13 +02:00
Eloy Lafuente (stronk7)
5ffe934241 Merge branch 'MDL-62319-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2018-10-16 00:03:04 +02:00
Andrew Nicols
2816fa5725 Merge branch 'MDL-63542-35' of git://github.com/jleyva/moodle into MOODLE_35_STABLE 2018-10-15 11:32:50 +08:00
Eloy Lafuente (stronk7)
f29fda6b3e MDL-63655 core: Fix miss-placed parenthesis 2018-10-15 01:02:51 +02:00
Amaia Anabitarte
de103e2329 MDL-63068 user: Allow underscore for profile custom fields shortname 2018-10-11 16:41:10 +02:00
Amaia Anabitarte
8b32d682a5 MDL-62920 user: Uploading deleted user and adding to a cohort 2018-10-11 16:28:18 +02:00
Shamim Rezaie
117006e9be MDL-63626 mod_quiz: Fixed a bug when there was no attempt on the quiz 2018-10-12 01:04:01 +11:00
Eloy Lafuente (stronk7)
18c5565a1e weekly release 3.5.2+ 2018-10-11 13:22:56 +02:00
Eloy Lafuente (stronk7)
60c2d866de Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE 2018-10-11 13:22:54 +02:00