David Monllaó [Wed, 24 Apr 2019 16:07:22 +0000 (18:07 +0200)]
Merge branch 'MDL-64666-master' of git://github.com/aanabit/moodle
David Monllaó [Wed, 24 Apr 2019 15:52:10 +0000 (17:52 +0200)]
Merge branch 'MDL-65207-master' of git://github.com/lameze/moodle
Amaia Anabitarte [Wed, 3 Apr 2019 16:29:16 +0000 (18:29 +0200)]
MDL-64666 core_message: New behat test for delete conversation
Amaia Anabitarte [Wed, 3 Apr 2019 16:05:55 +0000 (18:05 +0200)]
MDL-64666 core_message: Favourite private conversations data generator
David Monllaó [Wed, 24 Apr 2019 15:37:45 +0000 (17:37 +0200)]
Merge branch 'MDL-64782-master' of git://github.com/rezaies/moodle
Eloy Lafuente (stronk7) [Wed, 24 Apr 2019 10:21:38 +0000 (12:21 +0200)]
Merge branch 'MDL-64151-master-fix' of https://github.com/marinaglancy/moodle
Marina Glancy [Wed, 24 Apr 2019 09:34:13 +0000 (11:34 +0200)]
MDL-64151 forms: select element without selection
Select element that is not multiple should export null when nothing is
selected. If the element is displayed there will always be something
selected.
Jake Dallimore [Wed, 24 Apr 2019 08:54:55 +0000 (16:54 +0800)]
Merge branch 'MDL-64267-master' of git://github.com/bmbrands/moodle
Jun Pataleta [Wed, 24 Apr 2019 08:18:06 +0000 (16:18 +0800)]
Merge branch 'MDL-65032-master' of git://github.com/peterRd/moodle
Peter [Wed, 24 Apr 2019 04:50:35 +0000 (12:50 +0800)]
MDL-65032 mod_forum: Update existing function to include lock params
Bas Brands [Wed, 10 Apr 2019 07:54:50 +0000 (09:54 +0200)]
MDL-64267 core_message: sticky positioning of contact request info
Sara Arjona [Wed, 24 Apr 2019 07:18:25 +0000 (09:18 +0200)]
Merge branch 'MDL-65056-master' of git://github.com/abias/moodle
Tobias Reischmann [Thu, 14 Mar 2019 17:59:01 +0000 (18:59 +0100)]
MDL-64267 core_message: Removed pb-2 from message-container
The padding at the bottom broke layout in clean theme since it caused an
overflow, which resulted in a second scrollbar on the message-drawer.
Tobias Reischmann [Thu, 14 Mar 2019 17:53:00 +0000 (18:53 +0100)]
MDL-64267 core_message: Moved contact-request to dont cause scrollbar
The contact-request-sent-message-container was outside of the
conversation body and caused multiple overflows and thus multiple
scrollbars. Moving it inside does not have an effect on the layout
except one scrollbar is enough now.
Sara Arjona [Wed, 24 Apr 2019 07:02:20 +0000 (09:02 +0200)]
Merge branch 'MDL-65170-master' of https://github.com/snake/moodle
Jun Pataleta [Wed, 24 Apr 2019 06:19:17 +0000 (14:19 +0800)]
Merge branch 'MDL-65069-master' of git://github.com/peterRd/moodle
Peter [Mon, 8 Apr 2019 01:54:12 +0000 (09:54 +0800)]
MDL-65032 mod_forum: Updates based on Jun's feedback
Peter [Thu, 4 Apr 2019 04:48:45 +0000 (12:48 +0800)]
MDL-65032 mod_forum: Add locked column to the backup table.
Peter [Wed, 17 Apr 2019 03:03:49 +0000 (11:03 +0800)]
MDL-65069 mod_forum: Remove unused code and additional dev docs.
Additional updates to setting default subscription value for discussions
Peter [Mon, 8 Apr 2019 02:18:28 +0000 (10:18 +0800)]
MDL-65032 mod_forum: Pass the the entity factories into the vaults
Peter [Mon, 8 Apr 2019 02:15:15 +0000 (10:15 +0800)]
MDL-65032 mod_forum: Behat test for locking
Peter [Thu, 14 Mar 2019 06:00:33 +0000 (14:00 +0800)]
MDL-65032 mod_forum: Add discussion locking functionality
Peter [Wed, 27 Mar 2019 07:42:28 +0000 (15:42 +0800)]
MDL-65069 mod_forum: Behat test for the inline form
Peter [Wed, 27 Mar 2019 07:22:50 +0000 (15:22 +0800)]
MDL-65069 mod_forum: Pass the class to style the button
Peter [Wed, 27 Mar 2019 07:21:24 +0000 (15:21 +0800)]
MDL-65069 core_form: Expose the form's submit's class attribute
Exposed the submit button's class attribute so it can be overriden by
custom classes provided by the programmer.
Peter [Mon, 25 Mar 2019 23:24:53 +0000 (07:24 +0800)]
MDL-65069 mod_forum: Stripped out inpage form and advanced redirect
* Stripped out the form for the inpage on the discussion list page.
* Tweaked the 'Advanced' redirect to take into account a nosubmit button
which populates the subject, message and any files used within it.
Peter [Mon, 25 Mar 2019 03:07:25 +0000 (11:07 +0800)]
MDL-65069 mod_forum: inline 'add discussion' form
Adrian Greeve [Wed, 24 Apr 2019 02:27:39 +0000 (10:27 +0800)]
Merge branch 'MDL-65375-master' of https://github.com/sammarshallou/moodle
Adrian Greeve [Wed, 24 Apr 2019 01:27:07 +0000 (09:27 +0800)]
Merge branch 'MDL-65308' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 22:04:45 +0000 (00:04 +0200)]
Merge branch 'MDL-65382-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 21:55:35 +0000 (23:55 +0200)]
MDL-65354 core: pretend that 'moodle/course:browse' never existed
As far as the old capability only was added to master and we are
renaming it before release:
- don't need to deprecate the lang string.
- don't need to make any reference to it in the upgrade.txt info
So, basically, pretend it never existed.
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 21:45:21 +0000 (23:45 +0200)]
Merge branch 'MDL-65354-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 17:45:18 +0000 (19:45 +0200)]
Merge branch 'MDL-64676-master' of https://github.com/aanabit/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 17:26:47 +0000 (19:26 +0200)]
Merge branch 'MDL-64151-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 15:36:46 +0000 (17:36 +0200)]
on-demand release 3.7dev+
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 12:06:00 +0000 (14:06 +0200)]
MDL-64017 message_email: trailing whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 08:14:22 +0000 (10:14 +0200)]
Merge branch 'MDL-65324-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Tue, 23 Apr 2019 08:04:51 +0000 (16:04 +0800)]
MDL-65324 mod_forum: Fix tests for timed discussion settings
Adrian Greeve [Tue, 23 Apr 2019 06:38:33 +0000 (14:38 +0800)]
Merge branch 'MDL-64703-master-fix-1' of https://github.com/ryanwyllie/moodle
Ryan Wyllie [Tue, 23 Apr 2019 06:14:24 +0000 (14:14 +0800)]
MDL-64703 message: fix group conversation heading alignment
Adrian Greeve [Tue, 23 Apr 2019 05:32:55 +0000 (13:32 +0800)]
Merge branch 'MDL-64017_master-fix' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 11:56:06 +0000 (13:56 +0200)]
Merge branch 'MDL-65248' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 22 Apr 2019 23:22:19 +0000 (01:22 +0200)]
MDL-65248 analytics: Replace upgrade script to apply for all moves
While strictly we don't nedd to provide an upgrade path for master,
any dev/integration site already using some of the 3.7 new tagets
in models will break (class rename/move) if we don't perform the
update of all them.
This commit takes rid of the previous upgrade step, only performing
the update of a couple of targets and now supports all the (5) targets:
- course_dropout
- course_competencies
- course_completion
- course_gradetopass
- no_teaching
Eloy Lafuente (stronk7) [Mon, 22 Apr 2019 23:18:49 +0000 (01:18 +0200)]
MDL-65248 core_user: Move some upcoming_activities_due strings
From course lang files to user lang files (where the target belongs to)
AMOS BEGIN
MOV [target:upcomingactivitiesdue,core_course],[target:upcomingactivitiesdue,core_user]
MOV [target:upcomingactivitiesdue_help,core_course],[target:upcomingactivitiesdue_help,core_user]
AMOS END
Jun Pataleta [Tue, 23 Apr 2019 03:53:26 +0000 (11:53 +0800)]
Merge branch 'MDL-65311-xml-files' of https://github.com/brendanheywood/moodle
Jun Pataleta [Tue, 23 Apr 2019 03:48:50 +0000 (11:48 +0800)]
Merge branch 'MDL-65324-master' of git://github.com/peterRd/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 11:53:24 +0000 (13:53 +0200)]
Merge branch 'MDL-62459' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 11:50:22 +0000 (13:50 +0200)]
Merge branch 'MDL-65248_master' of git://github.com/dmonllao/moodle
David Monllaó [Mon, 22 Apr 2019 11:26:42 +0000 (13:26 +0200)]
Merge branch 'MDL-64924' of git://github.com/Chocolate-lightning/moodle
David Monllaó [Mon, 22 Apr 2019 11:24:52 +0000 (13:24 +0200)]
Merge branch 'MDL-64102-master' of git://github.com/bmbrands/moodle
David Monllaó [Mon, 22 Apr 2019 11:22:31 +0000 (13:22 +0200)]
Merge branch 'MDL-61199-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 11:43:56 +0000 (13:43 +0200)]
Merge branch 'MDL-64641-master' of git://github.com/jleyva/moodle
David Monllaó [Mon, 22 Apr 2019 11:16:32 +0000 (13:16 +0200)]
Merge branch 'MDL-65102-master' of git://github.com/rezaies/moodle
David Monllaó [Mon, 22 Apr 2019 08:23:49 +0000 (10:23 +0200)]
Merge branch 'MDL-65211-master' of git://github.com/jleyva/moodle
David Monllaó [Mon, 22 Apr 2019 08:22:23 +0000 (10:22 +0200)]
Merge branch 'MDL-65251-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2019 11:42:08 +0000 (13:42 +0200)]
Merge branch 'MDL-65254-master' of git://github.com/cescobedo/moodle
David Monllaó [Mon, 22 Apr 2019 08:08:57 +0000 (10:08 +0200)]
Merge branch 'MDL-65255-master' of git://github.com/jleyva/moodle
David Monllaó [Mon, 22 Apr 2019 08:05:50 +0000 (10:05 +0200)]
Merge branch 'MDL-65184' of git://github.com/Chocolate-lightning/moodle
David Monllaó [Mon, 22 Apr 2019 07:39:26 +0000 (09:39 +0200)]
Merge branch 'MDL-64701-category-customfields-master' of https://github.com/dmitriim/moodle
Shamim Rezaie [Tue, 26 Feb 2019 03:24:45 +0000 (14:24 +1100)]
MDL-64782 mnetservice_enrol: Performance improvement
Shamim Rezaie [Tue, 26 Feb 2019 03:13:20 +0000 (14:13 +1100)]
MDL-64782 core_badges: Performance improvement
Shamim Rezaie [Tue, 26 Feb 2019 02:43:36 +0000 (13:43 +1100)]
MDL-64782 core_enrol: Performance improvement
Shamim Rezaie [Tue, 26 Feb 2019 02:07:08 +0000 (13:07 +1100)]
MDL-64782 core_backup: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 13:45:34 +0000 (00:45 +1100)]
MDL-64782 core_calendar: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 17:05:48 +0000 (04:05 +1100)]
MDL-64782 core_calendar: Privacy deletion fix
Deleting in course context should not delete from course modules
Shamim Rezaie [Mon, 25 Feb 2019 05:37:34 +0000 (16:37 +1100)]
MDL-64782 core_cohort: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 05:19:51 +0000 (16:19 +1100)]
MDL-64782 tool_monitor: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 05:06:36 +0000 (16:06 +1100)]
MDL-64782 report_stats: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 04:59:09 +0000 (15:59 +1100)]
MDL-64782 core_group: Performance improvement
Shamim Rezaie [Mon, 25 Feb 2019 04:43:42 +0000 (15:43 +1100)]
MDL-64782 core_completion: Performance improvement
Mark Nelson [Tue, 23 Apr 2019 03:28:01 +0000 (11:28 +0800)]
MDL-64017 message_email: fixed incorrect unread count
David Monllaó [Mon, 22 Apr 2019 07:08:37 +0000 (09:08 +0200)]
Merge branch 'MDL-65222' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 28 Mar 2019 22:41:36 +0000 (23:41 +0100)]
MDL-62459 database: remove unused table role_sortorder
Eloy Lafuente (stronk7) [Sun, 21 Apr 2019 23:03:34 +0000 (01:03 +0200)]
Merge branch 'MDL-65378_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 21 Apr 2019 22:58:37 +0000 (00:58 +0200)]
Merge branch 'MDL-65275_master' of git://github.com/markn86/moodle
Alexander Bias [Wed, 27 Mar 2019 20:18:42 +0000 (21:18 +0100)]
MDL-65056 completion: Hide checkboxes on course page for teachers
sam marshall [Thu, 18 Apr 2019 13:52:09 +0000 (14:52 +0100)]
MDL-65375 Restore: Log restore must support new jsonformat setting
Includes support for the new jsonformat setting in logstore_standard
and logstore_database.
Also includes a bugfix where the restore used to restore NULL into
'other' fields, which were not null otherwise, so it was inconsistent
with normal logging.
Adrian Greeve [Thu, 18 Apr 2019 08:14:57 +0000 (16:14 +0800)]
Merge branch 'MDL-64017_master' of git://github.com/markn86/moodle
Mark Nelson [Fri, 5 Apr 2019 06:48:06 +0000 (14:48 +0800)]
MDL-64017 message_email: task to send messages as a digest
Jun Pataleta [Thu, 18 Apr 2019 05:47:50 +0000 (13:47 +0800)]
MDL-65382 tool_dataprivacy: Fix appearance of status labels
Jun Pataleta [Thu, 18 Apr 2019 05:47:30 +0000 (13:47 +0800)]
MDL-65382 mod_lti: Fix appearance of status labels
Jun Pataleta [Thu, 18 Apr 2019 05:29:28 +0000 (13:29 +0800)]
MDL-65382 admin: Fix appearance of status labels
Jun Pataleta [Thu, 18 Apr 2019 06:55:20 +0000 (14:55 +0800)]
Merge branch 'MDL-64137-master' of git://github.com/bmbrands/moodle
Bas Brands [Fri, 5 Apr 2019 04:18:26 +0000 (12:18 +0800)]
MDL-64017 message_email: Added mustache templates for email
Mark Nelson [Fri, 5 Apr 2019 06:48:26 +0000 (14:48 +0800)]
MDL-64017 core_message: can specify conversation to view on index page
Mark Nelson [Tue, 26 Mar 2019 02:07:49 +0000 (10:07 +0800)]
MDL-64017 message_email: populate new DB table when required
Mark Nelson [Mon, 25 Mar 2019 04:39:59 +0000 (12:39 +0800)]
MDL-64017 core: remove group conversation check for processors
We now want to allow processors to process group messages.
Mark Nelson [Mon, 25 Mar 2019 02:51:46 +0000 (10:51 +0800)]
MDL-64017 core_message: pass conversation type to processors
Mark Nelson [Thu, 18 Apr 2019 04:29:03 +0000 (12:29 +0800)]
MDL-64017 message_email: updated privacy provider
Mark Nelson [Mon, 25 Mar 2019 02:31:26 +0000 (10:31 +0800)]
MDL-64017 message_email: add new database table
This table will be responsible for storing the messages
that need to be emailed, but have not yet. A task will
run that will email these and then remove them from the
table.
Adrian Greeve [Thu, 18 Apr 2019 05:48:33 +0000 (13:48 +0800)]
Merge branch 'MDL-29318-master' of git://github.com/junpataleta/moodle
Adrian Greeve [Thu, 18 Apr 2019 03:47:13 +0000 (11:47 +0800)]
MDL-64715 core_message: Fix for message upgrade db prefix.
Jun Pataleta [Thu, 18 Apr 2019 03:09:49 +0000 (11:09 +0800)]
Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle
Adrian Greeve [Thu, 18 Apr 2019 03:06:57 +0000 (11:06 +0800)]
Merge branch 'MDL-64715-master-self-starred-pr-ryan' of git://github.com/sarjona/moodle
Adrian Greeve [Thu, 18 Apr 2019 01:10:52 +0000 (09:10 +0800)]
Merge branch 'MDL-64703-master' of git://github.com/bmbrands/moodle
Simey Lameze [Mon, 15 Apr 2019 04:03:53 +0000 (12:03 +0800)]
MDL-65354 core: replace all usages of old cap
Simey Lameze [Mon, 15 Apr 2019 03:58:58 +0000 (11:58 +0800)]
MDL-65354 core: rename course:browse cap to category:browsecourses
Peter [Wed, 17 Apr 2019 00:27:39 +0000 (08:27 +0800)]
MDL-64956 mod_forum: Updates based on IR
Eloy Lafuente (stronk7) [Wed, 17 Apr 2019 18:07:01 +0000 (20:07 +0200)]
on-demand release 3.7dev+
Eloy Lafuente (stronk7) [Wed, 17 Apr 2019 18:06:58 +0000 (20:06 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
