mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 16:04:00 +02:00
Code Issues Projects Releases Wiki Activity
90,887 Commits 36 Branches 528 Tags
c844eafd6f
Commit Graph

90887 Commits

Author SHA1 Message Date
Mihail Geshoski
c844eafd6f MDL-63684 core_calendar: Add support for removal of context users 
This issue is part of the MDL-62560 Epic.
 2018-10-31 14:10:08 +08:00
Eloy Lafuente (stronk7)
448bd578d8 on-demand release 3.6dev+ 2018-10-26 18:06:00 +02:00
Eloy Lafuente (stronk7)
6728c963f3 NOBUG: Fixed SVG browser compatibility 2018-10-26 18:05:58 +02:00
Eloy Lafuente (stronk7)
51da48f193 Merge branch 'MDL-63765-master' of git://github.com/damyon/moodle 2018-10-26 10:21:43 +02:00
Damyon Wiese
cfd390ee94 MDL-63765 behat: Fix behat tests opening a menu 
If javascript is disabled, we don't need to open the menus at all. If it is enabled
we should use the custom step where possible.

In some tests (user profile) we have to use link_or_button because
the element that opens the menu will be a link or a button in different themes.
 2018-10-26 16:14:41 +08:00
Andrew Nicols
74138e927c Revert "MDL-63466 core_message: rename cache for last message time" 
This reverts commit f978593d6c3b98db5b3feb29448a642b4f540edc.
 2018-10-26 14:54:01 +08:00
Andrew Nicols
4699b8bc41 Revert "MDL-63466 core_message: removed get_last_message_time_created_cache_key" 
This reverts commit 4f22d7f23b022c143910a9a136fecbd325dce356.
 2018-10-26 14:53:58 +08:00
Andrew Nicols
621e7eb022 Merge branch 'MDL-63466-master' of https://github.com/snake/moodle 2018-10-26 12:33:13 +08:00
Jake Dallimore
b95e4c786c MDL-63466 core_message: don't reorder messages when formatting 
- Removed the reordering code from helper::get_conversation_messages()
- Added unit test confirming sort param behaviour for the
api::get_conversations_messages() method.
 2018-10-26 12:26:23 +08:00
Andrew Nicols
b272efb460 Merge branch 'MDL-63673-master' of git://github.com/mihailges/moodle 2018-10-26 11:40:46 +08:00
Andrew Nicols
b8e9448a2c Merge branch 'MDL-63281_master' of git://github.com/markn86/moodle 2018-10-26 11:24:52 +08:00
Andrew Nicols
00fd35a916 Merge branch 'MDL-60514-master-fix' of git://github.com/junpataleta/moodle 2018-10-26 11:06:44 +08:00
Jun Pataleta
96b9975b4b MDL-60514 tool_task: Remove run_task_now.feature 
This test cannot be run on Behat anymore as the "Run now" feature
depends on $CFG->pathtophp. Even if it's set, the task executed via
"Run now" will be executed for the installed site itself and not on the
Behat test site.
 2018-10-26 11:03:07 +08:00
Andrew Nicols
6f63531458 Merge branch 'MDL-63682-master' of git://github.com/mihailges/moodle 2018-10-26 11:01:28 +08:00
cescobedo
9eba829ae3 MDL-63281 core_message: Sync course group members with conversations 2018-10-26 10:55:59 +08:00
Mihail Geshoski
bdf1b47550 MDL-63682 mnetservice_enrol: Add support for removal of context users 
This issue is part of the MDL-62560 Epic.
 2018-10-26 10:22:53 +08:00
Andrew Nicols
ab2443cdc0 Merge branch 'MDL-63688-master-1' of git://github.com/mihailges/moodle 2018-10-26 10:16:08 +08:00
Andrew Nicols
79b5095f28 Merge branch 'MDL-63280_master-fix' of git://github.com/markn86/moodle 2018-10-26 09:07:30 +08:00
Mark Nelson
06cdb82d23 MDL-63280 core: correct index on upgrade vs install 2018-10-26 08:52:27 +08:00
Andrew Nicols
56076d5991 Merge branch 'MDL-63280_master' of git://github.com/markn86/moodle 2018-10-26 07:49:13 +08:00
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