moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
91028 commits 37 branches 540 tags 1.3 GiB
Commit graph

91028 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
513bb61301 Merge branch 'MDL-62904-master' of git://github.com/junpataleta/moodle 2018-10-26 00:03:43 +02:00
Juan Leyva
cde3dc05bc MDL-63694 core_block: Return block contents via WS 2018-10-25 23:42:48 +02:00
Juan Leyva
a9732b8977 MDL-63694 block_html: Implement get_content_for_external 2018-10-25 23:42:42 +02:00
Juan Leyva
96d9a6e430 MDL-63694 core_block: New block class method for external content 
New method added block_base::get_content_for_external().
It will return all the block contents rendered for external functions.
If your block is returning formatted content or provide files for download,
you should override this method to use the external_format_text,
external_format_string functions for formatting or
external_util::get_area_files for files.
See block_html as example.
 2018-10-25 23:41:26 +02:00
Eloy Lafuente (stronk7)
da73189b84 Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle 2018-10-25 12:23:53 +02:00
Tim Hunt
8951e8b970 MDL-62411 qtype_ddmarkers: fix drop-zone editing in IE 2018-10-25 11:08:04 +01:00
Mark Nelson
76540bec52 MDL-63280 core: removed 'message_conversation_area' table 
These new fields have been added to the 'message_conversations'
table.
 2018-10-25 18:05:20 +08:00
Mark Nelson
5571af1614 MDL-63280 core_message: added constants for enabled/disabled 2018-10-25 17:51:34 +08:00
Mark Nelson
f0e137c539 MDL-63280 core: minor changes after review 
- Fixed reference to non-existent column 'timeread'.
- Fixed alignment issues.
- Fixed inconsistencies between upgrade.php and install.xml.
- Cleaned unit tests of unnecessary DB calls.
- Renamed 'get_does_conversation_area_enabled' to
  'is_conversation_area_enabled' and moved to api.php.
- Replaced "$mform->elementExists('enablemessaging')"
  check with a capability check.
- Removed the change of [] to array() in unrelated to upgrade code.
- Updated conversation 'timemodified' field when updating name.
- Bumped version based on latest master.
 2018-10-25 17:51:04 +08:00
Andrew Nicols
9d4a9e515f Merge branch 'MDL-63552-master' of git://github.com/mickhawkins/moodle 2018-10-25 15:43:12 +08:00
Andrew Nicols
37ef65d47a Merge branch 'MDL-63752' of https://github.com/timhunt/moodle 2018-10-25 15:14:57 +08:00
Andrew Nicols
fbf4eaeec0 Merge branch 'MDL-63679-master' of git://github.com/mihailges/moodle 2018-10-25 15:12:50 +08:00
Andrew Nicols
c31ac0f5e2 Merge branch 'MDL-63678-master' of git://github.com/mihailges/moodle 2018-10-25 15:11:30 +08:00
Jun Pataleta
35b76161b3 Merge branch 'MDL-60514-master-new-cron-execution' of https://github.com/tonibarbera/moodle 2018-10-25 15:06:47 +08:00
Andrew Nicols
c3d1878ff3 Merge branch 'MDL-63655' of git://github.com/stronk7/moodle 2018-10-25 14:53:18 +08:00
Andrew Nicols
c7be63a45d MDL-63058 block_myoverview: Whitespace fixes 2018-10-25 14:44:35 +08:00
Andrew Nicols
7583dd6902 MDL-63058 block_myoverview: Whitespace fixes 2018-10-25 14:32:59 +08:00
Toni Barberà Melià
c759ae5d55 MDL-60514 tasks: added new config parameter. changes in cron execution 2018-10-25 08:02:44 +02:00
cescobedo
e7f467143f MDL-63280 core_message: Create group conversation from group edit page 
Allows linking of course groups with conversations when group messaging feature is enabled.
 2018-10-25 12:20:00 +08:00
cescobedo
55fda006e3 MDL-63280 core_message: Create conversation area 2018-10-25 12:20:00 +08:00
Andrew Nicols
2263bbdfce Merge branch 'MDL-63058-master' of git://github.com/bmbrands/moodle 2018-10-25 11:49:45 +08:00
Michael Hawkins
fc087fd29e MDL-63552 search_solr: Add support for removal of context users 
This issue is a part of the MDL-62560 Epic.
 2018-10-25 11:41:08 +08:00
Michael Hawkins
4cef924482 MDL-63552 search_simpledb: Add support for removal of context users 
This issue is a part of the MDL-62560 Epic.
Also added test_get_contexts_for_userid unit test.
 2018-10-25 11:41:08 +08:00
Damyon Wiese
1524c4d66c Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle 2018-10-25 08:36:49 +08:00
Eloy Lafuente (stronk7)
980ed5424d Merge branch 'MDL-62145-master' of git://github.com/damyon/moodle 2018-10-25 01:35:09 +02:00
Eloy Lafuente (stronk7)
3d18697115 Merge branch 'MDL-63153_master' of https://github.com/aanabit/moodle 2018-10-25 01:11:36 +02:00
Eloy Lafuente (stronk7)
19dbce00a1 Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle 2018-10-25 00:10:45 +02:00
Bas Brands
099049b6ad MDL-63058 block_myoverview: behat fixes and summary view check 2018-10-24 15:02:19 +02:00
Andrew Nicols
c7120f7805 MDL-63755 theme_boost: Behat selector fix 2018-10-24 20:16:22 +08:00
Tim Hunt
2d696f8f2b MDL-63752 question import: duplicate key error when idnumbers blank 
And extra checks to head off possible idnumber='' issues in two other places.
 2018-10-24 11:38:31 +01:00
David Monllao
fcc50ccbc3 Merge branch 'MDL-63277' of https://github.com/timhunt/moodle 2018-10-24 10:22:16 +02:00
David Monllao
f560f3669e Merge branch 'MDL-63619-master' of git://github.com/andrewnicols/moodle 2018-10-24 09:48:16 +02:00
Andrew Nicols
eb514bb3e5 MDL-63714 javascript: Add new core/pending module 2018-10-24 12:49:09 +08:00
Andrew Nicols
f0bfedf348 MDL-63714 theme_boost: Fix aria focus behat issues 2018-10-24 12:45:13 +08:00
Andrew Nicols
66de50c366 Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle 2018-10-24 10:21:42 +08:00
Mark Nelson
d1e8e69d85 MDL-63466 core_message: deprecated methods and services 2018-10-24 09:40:07 +08:00
Mark Nelson
4f22d7f23b MDL-63466 core_message: removed get_last_message_time_created_cache_key 2018-10-24 09:39:59 +08:00
Mark Nelson
f978593d6c MDL-63466 core_message: rename cache for last message time 2018-10-24 09:39:42 +08:00
Sara Arjona
fb04293bb1 MDL-63466 core_message: Add conversation support to get_messages 
- The get_conversation_messages has been added to the API and the WS
with the conversation identifier (convid) instead of the userto,
to let get conversation messages and the members involved.
- The cache has been also reviewed, to use the convid instead of the
[userfrom, userto] keys.
- The get_most_recent_conversation_messages has been added to the API
to update the cache when needed.
 2018-10-24 09:39:05 +08:00
Sara Arjona
d89d0d6593 MDL-63466 core_message: Added format_conversation_messages helper 
The format_conversation_messages function has been added. It returns
the messages and the array of users who have sent any of these
messages.
 2018-10-24 09:38:10 +08:00
Sara Arjona
ecf7567a89 MDL-63466 core_message: Add conversationid to message class 2018-10-24 09:38:01 +08:00
Mihail Geshoski
1d3d4c66df MDL-63688 core_tag: Add method that returns users in context 
This issue is part of the MDL-62560 Epic.
 2018-10-24 09:31:19 +08:00
Jake Dallimore
042d804453 MDL-63466 core_message: added a test helper class 
Providing util methods for api and externallib testing.
 2018-10-24 09:27:34 +08:00
Jake Dallimore
2a2b86f123 MDL-63466 core_message: add helper method for fetching member info 
The aim is to use this to standardise the member information we return
from several methods in the API, such as get_conversations,
get_conversation_messages, get_conversation_members, and in search
methods.
 2018-10-24 09:23:30 +08:00
Andrew Nicols
d95ad08f85 MDL-63619 tool_dataprivacy: Cache purposes in form 2018-10-24 08:48:18 +08:00
Andrew Nicols
3b002c86eb MDL-63619 tool_dataprivacy: Performance improvement 2018-10-24 08:48:18 +08:00
Andrew Nicols
d2aed78933 MDL-63619 tool_dataprivacy: Fix inheritance from parent contexts 
Inheritance should behave such that all contexts inherit from their
parent context.

Prior to this fix, if the value was not set on a context, then it was
getting a default of 'Inherit', but instead of inheritting from the
parent context, it was inheritting from its parent context _level_ which
is just wrong.
 2018-10-24 08:48:18 +08:00
Andrew Nicols
4b7ad8845c MDL-63714 core: Wrap doRender in pendingjs 2018-10-24 08:12:10 +08:00
Andrew Nicols
dc39d0cf39 MDL-63714 javascript: Improve docs for pendingjs 2018-10-24 08:00:00 +08:00
Mihail Geshoski
8171cd7f3c MDL-63673 fileconverter_googledrive: Support removal of context users 
This issue is part of the MDL-62560 Epic.
 2018-10-24 07:02:16 +08:00