Dan Poltawski [Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)]
Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Tue, 13 Oct 2015 06:24:08 +0000 (14:24 +0800)]
MDL-48861 assign: Make the requires grading filter consistent
Consistently include submissions with a null grade (see MDL-47694).
Damyon Wiese [Tue, 13 Oct 2015 04:57:10 +0000 (12:57 +0800)]
MDL-48861 assign: Fix unit tests and behat tests
The tests were not working with the change to the needs grading filter.
David Monllao [Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)]
Merge branch 'MDL-46455-master-
20151012' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 13 Oct 2015 03:33:23 +0000 (11:33 +0800)]
Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 03:05:05 +0000 (11:05 +0800)]
Merge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 13 Oct 2015 02:33:32 +0000 (10:33 +0800)]
Merge branch 'MDL-51517_master' of git://github.com/lazydaisy/moodle
Andrew Nicols [Tue, 13 Oct 2015 02:13:43 +0000 (10:13 +0800)]
Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)]
Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle
Ryan Wyllie [Tue, 13 Oct 2015 01:46:25 +0000 (01:46 +0000)]
MDL-51576 navigation: stop course nav duplication
The course navigation was getting duplicate nodes because
it was loading the nav tree plugin functions twice. Once
specifically for the reports and then a second time more generally.
The code will now explicitly skip loading the report plugin
functions on the second load.
Andrew Nicols [Tue, 13 Oct 2015 01:45:41 +0000 (09:45 +0800)]
Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle
Adrian Greeve [Tue, 13 Oct 2015 01:10:18 +0000 (09:10 +0800)]
MDL-49515 libraries: Update to editpdf/classes/pdf.php
This updates fpdi_bridge to extend our Moodle pdf class
as was done before.
Andrew Nicols [Tue, 13 Oct 2015 01:24:31 +0000 (09:24 +0800)]
Merge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 13 Oct 2015 00:08:51 +0000 (08:08 +0800)]
Merge branch 'MDL-50788-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 12 Oct 2015 16:01:41 +0000 (17:01 +0100)]
Merge branch 'MDL-51375' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 12 Oct 2015 15:53:18 +0000 (16:53 +0100)]
Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)]
Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 12 Oct 2015 10:47:45 +0000 (11:47 +0100)]
Merge branch 'MDL-51536-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)]
Merge branch 'MDL-51586-master' of git://github.com/xow/moodle
David Monllao [Mon, 12 Oct 2015 09:08:27 +0000 (17:08 +0800)]
Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)]
Merge branch 'MDL-51083-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 12 Oct 2015 08:46:00 +0000 (09:46 +0100)]
Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 12 Oct 2015 08:23:39 +0000 (16:23 +0800)]
MDL-46455 Events: Add db mapping info even if not part of backup
We can return db mapping info even for objects that are not included
in backup/restore and it may be useful in future (no use in core yet).
Juan Leyva [Fri, 2 Oct 2015 08:21:33 +0000 (10:21 +0200)]
MDL-51637 forum: Make forum_get_discussions_paginated return group post
Juan Leyva [Mon, 28 Sep 2015 12:04:04 +0000 (14:04 +0200)]
MDL-51568 self_enrol: New Web Service enrol_self_enrol_user
Andrew Nicols [Mon, 12 Oct 2015 06:54:34 +0000 (14:54 +0800)]
MDL-49682 mod_forum: Correct arguments to format_message_text
This feeds straight into context_module::instance() and I was inadvertantly
using the forum->id, rather than the cm->id.
Andrew Nicols [Mon, 12 Oct 2015 06:15:14 +0000 (14:15 +0800)]
Merge branch 'MDL-51528-int-fix-1' of https://github.com/ryanwyllie/moodle
David Monllao [Mon, 12 Oct 2015 06:07:55 +0000 (14:07 +0800)]
MDL-49682 mod_forum: Bump version for caches
David Monllao [Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)]
Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
Ryan Wyllie [Mon, 12 Oct 2015 05:45:13 +0000 (05:45 +0000)]
MDL-51528 themes: bootstrap v2.3.2 in thirdpartylibs
Increase the bootstrap version from v2.3.0 to v2.3.2
in the thirdpartylibs.xml file.
Andrew Nicols [Mon, 12 Oct 2015 05:37:14 +0000 (13:37 +0800)]
MDL-46497 atto: Whitespace/coding style fix
Andrew Nicols [Mon, 12 Oct 2015 05:35:24 +0000 (13:35 +0800)]
Merge branch 'MDL-46497_master' of https://github.com/nadavkav/moodle
Andrew Nicols [Fri, 25 Sep 2015 11:57:05 +0000 (19:57 +0800)]
MDL-49682 mod_forum: Build forum email templates
Andrew Nicols [Mon, 12 Oct 2015 02:42:15 +0000 (10:42 +0800)]
Merge branch 'MDL-51528-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 12 Oct 2015 02:36:05 +0000 (10:36 +0800)]
Merge branch 'MDL-51524-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 12 Oct 2015 02:10:51 +0000 (10:10 +0800)]
Merge branch 'MDL-51451-master' of https://github.com/sammarshallou/moodle
Mark Nelson [Tue, 6 Oct 2015 23:44:18 +0000 (16:44 -0700)]
MDL-46455 events: added more mapping
Also fixed a few bugs.
Andrew Nicols [Fri, 9 Oct 2015 05:03:33 +0000 (13:03 +0800)]
MDL-51524 tests: Fix broken tests
The upgraded version of HTML2Text highlighted some bugs in our unit tests.
In the IOS test, the HTML content includes a couple of patches of
In the previous version of HTML2Text, these were being converted to
breaking spaces. In one of these cases, it was then removed due to a trim.
The expected texts have been converted to use the correct non-breaking spaces.
In the case of the trimmed one, it is no longer trimmed as non-breaking
spaces are not trimmed.
This gives a truer reflection of the actual text.
In the case of the Outlook test, this trailing whitespace is not present in
the source. It was likely caused by a bug in the previous version of
HTML2Text.
In the case of the weblib change, the test was just wrong. Both of the
actual characters are encodings for an HTML bullet (decimal and hex) and
should both be converted to the relevant UTF8 representation of this
bullet.
Andrew Nicols [Thu, 1 Oct 2015 06:04:15 +0000 (14:04 +0800)]
MDL-51524 libraries: Update to latest version of html2text
We were previously using an ancient version of html2text from RoundCube
with many customisations.
This patchset moves to the version included in the latest version of
HTML2Text, and wraps the library in a moodle-provided class. This
moves all previous hacks away from that class.
Unfortunately, two hacks still remain - two of the functions in the
RoundCube class are private, and must be modified to protected in order to
use the class effectively.
Damyon Wiese [Thu, 24 Sep 2015 07:03:26 +0000 (15:03 +0800)]
MDL-46455 restore: Add debug messages when log records cannot be mapped
Damyon Wiese [Thu, 24 Sep 2015 06:32:39 +0000 (14:32 +0800)]
MDL-46455 logstores: Do not try and map empty fields on restore.
Damyon Wiese [Thu, 24 Sep 2015 06:27:24 +0000 (14:27 +0800)]
MDL-46455 event: Make the debugging messages print the event class.
Because they are in the base class, it was impossible to find which event
triggered the debugging.
Damyon Wiese [Wed, 23 Sep 2015 08:00:33 +0000 (16:00 +0800)]
MDL-46455 events: Add mapping info to events
This commit covers all events outside of /mod/. It adds mapping info for restoring
events, or the default implementation which returns false if mapping is not required.
Mark Nelson [Fri, 25 Sep 2015 00:02:57 +0000 (17:02 -0700)]
MDL-46455 mod_*: added restore mapping to events
Mark Nelson [Fri, 25 Sep 2015 00:03:41 +0000 (17:03 -0700)]
MDL-46455 mod_*: added additional mapping to be used by events
Mark Nelson [Tue, 22 Sep 2015 23:25:19 +0000 (16:25 -0700)]
MDL-46455 restore: added restore support for 'other' in events
lazydaisy [Sat, 10 Oct 2015 10:02:38 +0000 (11:02 +0100)]
MDL-51517 theme_bootstrapbase: Clean up buttons.less
Mark Nelson [Mon, 21 Sep 2015 23:43:44 +0000 (16:43 -0700)]
MDL-46455 restore: added restore support for the 'objectid' in events
Damyon Wiese [Mon, 21 Sep 2015 05:39:51 +0000 (13:39 +0800)]
MDL-46455 backup: Keep external database logstore code self-contained.
General backup/restore does not need to handle external data sources natively - so
any changes needed to achieve this should be contained to the plugin that needs it.
Mark Nelson [Fri, 18 Sep 2015 23:00:08 +0000 (16:00 -0700)]
MDL-46455 logstore_database: added backup/restore support
Eloy Lafuente (stronk7) [Sun, 29 Mar 2015 23:19:01 +0000 (01:19 +0200)]
MDL-46455 restore: Implement restore of standard logstore
Using standard subplugin support, this commits implements
the restore of logstore subplugins in general and the
standard logstore is particular. Notes:
- TODO: Decide about these 2 pending issues:
1) Some logs are already created (events fired) by the restore process itself. Every time
an API is used and it fires events... corresponding (and actual!)
logs are created. We need to prevent restore to duplicate them (or,
alternatively, stop firing events when restore is happening).
2) There are 2 pieces of information in the logs that, right now, can
not be restored, because the process does not know enough to be able
to remap that information to its new counterparts. We are talking
about objectid and other columns. So we need to specify, in some way
understandable by restore, to which existing mappings they correspond
to.
Eloy Lafuente (stronk7) [Sun, 29 Mar 2015 14:53:07 +0000 (16:53 +0200)]
MDL-46455 backup: Implement backup of standard logstore
Using standard subplugin support, this commit implements
the backup of logstore subplugins in general and the
standard logstore in particular. Notes:
- Uses a custom final element (base64_encode_final_element) to
support the storage of serialized 'other' information in logs.
- Organization: Instead of directly extending backup_subplugin,
every logstore extends backup_tool_log_logstore_subplugin just
in case any shared code is needed in the future.
- Implements both course and activity logs, sharing the structure
completely (both are based in contextid to pick the target
information, from database or whatever other logstores use).
Eloy Lafuente (stronk7) [Mon, 16 Mar 2015 02:08:44 +0000 (03:08 +0100)]
MDL-46455 restore: Extend support for subplugins to any plugin.
In order to implement the backup and restore of log stores, that
are created as subplugins of the tool_log plugin , we need to
extend subplugins support from activities to virtually any plugin.
Basically that implies moving the add_subplugin_structure() method from
its current, restricted, activity level to general restore_structure_step.
This commit implements the change in restore, covered with tests verifying
old, bc behavior and also new, general one.
Eloy Lafuente (stronk7) [Sun, 8 Mar 2015 18:38:44 +0000 (19:38 +0100)]
MDL-46455 backup: Extend support for subplugins to any plugin.
In order to implement the backup and restore of log stores, that
are created as subplugins of the tool_log plugin , we need to
extend subplugins support from activities to virtually any plugin.
Basically that implies moving the add_subplugin_structure() method from
its current, restricted, activity level to general backup_structure_step.
This commit implements the change in backup, covered with tests verifying
old, bc behavior and also new, general one.
Lior Gil [Fri, 9 Oct 2015 22:26:42 +0000 (01:26 +0300)]
MDL-46497 Atto: Fix adding redundant p elements in rtl/ltr actions
Dan Poltawski [Fri, 9 Oct 2015 10:22:26 +0000 (11:22 +0100)]
MDL-50079 atto_link: respect new window option when creating from repo
Previously users had to go back and edit their link to set the new
window option.
Dan Poltawski [Fri, 9 Oct 2015 09:31:17 +0000 (10:31 +0100)]
MDL-50788 classloader: Prevent cryptic errors on unreadable classes dir
Do not attempt to read an unreadable directory because previously the generated
errors were hard to fathom.
Thanks to James McQuillan for the basis of the patch.
Dan Poltawski [Fri, 9 Oct 2015 07:58:33 +0000 (08:58 +0100)]
MDL-51302 scorm: do not use invalid course urls
Previous behaviour of setting an empty sectionid was incorrect and we
were doing work which course_get_url() does for us.
Damyon Wiese [Fri, 9 Oct 2015 07:42:10 +0000 (15:42 +0800)]
MDL-51605 Atto: Fix deprecation warnings from upgraded rangy
John Okely [Thu, 8 Oct 2015 06:56:44 +0000 (14:56 +0800)]
MDL-51586 enrol: Enrolment table displays fullname properly.
When the alternatefullnamedisplay was set to something that
didn't contain 'firstname' then nothing would be displayed
for the user's name.
Damyon Wiese [Fri, 9 Oct 2015 07:08:06 +0000 (15:08 +0800)]
MDL-48861 mod_assign: use >= for requires grading filter
If the grade and submission were modified at exactly the same time,
assume that this means the grade was automatically created for the submission
and is not a real grade from a teacher interaction.
Adrian Greeve [Wed, 30 Sep 2015 07:07:45 +0000 (15:07 +0800)]
MDL-49515 libraries: Update FPDI to 1.5.4
Ryan Wyllie [Fri, 9 Oct 2015 06:34:43 +0000 (06:34 +0000)]
MDL-51528 themes: active tab cursor
Set the cursor to a pointer for an active tab with a link to
indicate that the tab is still clickable, even though it is
active. See also MDL-46470 and MDL-51207.
Ryan Wyllie [Wed, 7 Oct 2015 05:13:22 +0000 (05:13 +0000)]
MDL-51528 themes: Moodle changes to Bootstrap
Applying the upstream Bootstrap changes required for Moodle. Please
see MDL-42195 and MDL-48328 for more defails.
Ryan Wyllie [Wed, 7 Oct 2015 04:53:59 +0000 (04:53 +0000)]
MDL-51528 themes: update to bootstrap v2.3.2
Updated to clean version of Bootstrap v2.3.2 without the
Moodle patches to the upstream code.
Mifsud Gaël [Fri, 28 Aug 2015 06:01:50 +0000 (14:01 +0800)]
MDL-51083 admin: Prevent password autofill in authentication settings
Eric Merrill [Tue, 6 Oct 2015 15:30:00 +0000 (11:30 -0400)]
MDL-36606 gradereport: Update AJAX grader to understand gradeless cells
Andrew Robert Nicols [Fri, 16 Nov 2012 11:09:17 +0000 (11:09 +0000)]
MDL-36606 gradereport: Correctly handle ungraded assessment ajax grading
Barbara Ramiro [Thu, 8 Oct 2015 07:10:34 +0000 (15:10 +0800)]
MDL-40442 Icon: Improved svg download icon and png version
Dan Poltawski [Thu, 8 Oct 2015 10:36:35 +0000 (11:36 +0100)]
weekly release 3.0dev
Dan Poltawski [Thu, 8 Oct 2015 10:36:35 +0000 (11:36 +0100)]
NOBUG: Fixed file access permissions
Dan Poltawski [Thu, 8 Oct 2015 10:36:33 +0000 (11:36 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 8 Oct 2015 10:30:54 +0000 (11:30 +0100)]
Merge branch 'MDL-51523_master' of git://github.com/markn86/moodle
David Monllao [Thu, 8 Oct 2015 07:57:46 +0000 (15:57 +0800)]
MDL-51623 core_event: Updating error messages
David Monllao [Thu, 8 Oct 2015 07:53:00 +0000 (15:53 +0800)]
Merge branch 'MDL-51623_parent_event' of git://github.com/moodlerooms/moodle
Adam Olley [Thu, 8 Oct 2015 03:41:15 +0000 (14:11 +1030)]
MDL-51285 mod_forum: Posts all need to have different stamps
Andrew Nicols [Thu, 8 Oct 2015 01:17:29 +0000 (09:17 +0800)]
Merge branch 'MDL-51341_enrolled_users_filter' of git://github.com/davosmith/moodle
Andrew Nicols [Thu, 8 Oct 2015 01:12:12 +0000 (09:12 +0800)]
Merge branch 'wip-mdl-51660' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 7 Oct 2015 23:06:17 +0000 (01:06 +0200)]
Merge branch 'MDL-51624-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 7 Oct 2015 22:12:36 +0000 (00:12 +0200)]
Merge branch 'MDL-51566-master' of git://github.com/jleyva/moodle
Davo Smith [Wed, 23 Sep 2015 16:14:46 +0000 (17:14 +0100)]
MDL-51341 enrolment: fix 'No group' enrolled user filter
Dan Poltawski [Wed, 7 Oct 2015 15:39:13 +0000 (16:39 +0100)]
Merge branch 'MDL-51531-master' of git://github.com/damyon/moodle
Juan Leyva [Wed, 30 Sep 2015 19:55:06 +0000 (21:55 +0200)]
MDL-51624 mod_lti: New Web Service mod_lti_view_lti
Juan Leyva [Wed, 30 Sep 2015 19:33:09 +0000 (21:33 +0200)]
MDL-51624 mod_lti: Rename function lti_view to lti_launch_tool
Juan Leyva [Mon, 28 Sep 2015 09:46:53 +0000 (11:46 +0200)]
MDL-51566 mod_choice: New WS mod_choice_delete_choice_responses
Dan Poltawski [Wed, 7 Oct 2015 11:19:13 +0000 (12:19 +0100)]
Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Wed, 7 Oct 2015 11:14:47 +0000 (12:14 +0100)]
Merge branch 'MDL-50945-master' of git://github.com/xow/moodle
Dan Poltawski [Wed, 7 Oct 2015 10:36:21 +0000 (11:36 +0100)]
Merge branch 'MDL-50543-master' of git://github.com/jleyva/moodle
sam marshall [Thu, 17 Sep 2015 17:35:55 +0000 (18:35 +0100)]
MDL-51451 Moodle dialogues: Lock scroll causes background jump
When you add a module or otherwise cause a Moodle dialogue to appear, this
enables the 'lock scroll' feature (the scrollbar disappears).
On some browsers this causes the width of the viewport to change, which can
cause centered/right-aligned theme elements to move distractingly.
This change temporarily sets body max-width while lock scroll is active.
David Monllao [Wed, 7 Oct 2015 07:34:23 +0000 (15:34 +0800)]
Merge branch 'MDL-51567-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 7 Oct 2015 07:24:36 +0000 (15:24 +0800)]
Merge branch 'MDL-51632_echo_url' of git://github.com/moodlerooms/moodle
Dan Poltawski [Wed, 7 Oct 2015 06:59:31 +0000 (07:59 +0100)]
Merge branch 'wip-mdl-50524' of https://github.com/rajeshtaneja/moodle
rajesh Taneja [Wed, 7 Oct 2015 06:47:01 +0000 (14:47 +0800)]
MDL-50524 behat: Fixed multiple when then and use of generator
David Monllao [Wed, 7 Oct 2015 06:14:21 +0000 (14:14 +0800)]
Merge branch 'MDL-51537-master' of git://github.com/lameze/moodle
Conflicts:
lib/upgrade.txt
David Monllao [Wed, 7 Oct 2015 05:46:40 +0000 (13:46 +0800)]
Merge branch 'MDL-51526-master' of git://github.com/cameron1729/moodle
Cameron Ball [Wed, 7 Oct 2015 05:42:40 +0000 (13:42 +0800)]
MDL-51526 mail: Import PHPMailer 5.2.13
David Monllao [Wed, 7 Oct 2015 04:56:03 +0000 (12:56 +0800)]
MDL-51579 course: Bump version to update mobile service
David Monllao [Wed, 7 Oct 2015 04:48:03 +0000 (12:48 +0800)]
Merge branch 'MDL-51579-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
David Monllao [Wed, 7 Oct 2015 03:22:56 +0000 (11:22 +0800)]
Merge branch 'wip-mdl-51285' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 7 Oct 2015 03:15:26 +0000 (11:15 +0800)]
Merge branch 'MDL-51250-master-3' of git://github.com/junpataleta/moodle