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
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
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.
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
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.
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
Jakub Kania [Tue, 6 Oct 2015 20:13:12 +0000 (21:13 +0100)]
MDL-50945 course: Add form-submit class to course edit buttons.
With contributions from Mary Evans.
Jun Pataleta [Wed, 7 Oct 2015 02:39:54 +0000 (21:39 -0500)]
MDL-51250 course: Add validation for section name
Andrew Nicols [Wed, 7 Oct 2015 02:25:56 +0000 (10:25 +0800)]
Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Fri, 14 Aug 2015 04:28:09 +0000 (12:28 +0800)]
MDL-41042 coursecat: reset course contacts cache more often
Marina Glancy [Fri, 14 Aug 2015 04:27:26 +0000 (12:27 +0800)]
MDL-41042 coursecat: better handle changes in coursecontact
Adrian Greeve [Wed, 7 Oct 2015 00:43:38 +0000 (08:43 +0800)]
MDL-49028 mod_wiki: Fix for reseting pages and tags
This will ensure that both pages and tags will be
removed when all the reset options for the wiki are
selected.
David Monllao [Wed, 7 Oct 2015 01:32:13 +0000 (09:32 +0800)]
Merge branch 'MDL-51521-master' of git://github.com/cameron1729/moodle
David Monllao [Wed, 7 Oct 2015 01:22:31 +0000 (09:22 +0800)]
Merge branch 'MDL-51525-master' of git://github.com/ryanwyllie/moodle
David Monllao [Wed, 7 Oct 2015 01:20:13 +0000 (09:20 +0800)]
Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Wed, 7 Oct 2015 00:18:10 +0000 (08:18 +0800)]
Merge branch 'MDL-45981-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 6 Oct 2015 23:12:17 +0000 (01:12 +0200)]
Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle
Eloy Lafuente (stronk7) [Tue, 6 Oct 2015 23:08:52 +0000 (01:08 +0200)]
Merge branch 'MDL-49823-master' of git://github.com/jleyva/moodle
AMOS bot [Tue, 6 Oct 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files
Andrew Hancox [Wed, 1 Jul 2015 15:32:12 +0000 (16:32 +0100)]
MDL-50526 mod_assign: Highlight error message when user has no group
If I set the "Require group to make submission" setting in an assignment
activity to yes, students who are not in any group are prevented from submitting
their assignment and are presented a warning instead that they should contact
their teacher. This message is now presented in an alert box.
Dan Poltawski [Tue, 6 Oct 2015 15:14:43 +0000 (16:14 +0100)]
MDL-50524 assign: improve method visibility and upgrade.txt
Dan Poltawski [Tue, 6 Oct 2015 15:06:41 +0000 (16:06 +0100)]
Merge branch 'MDL-50524' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 6 Oct 2015 13:36:51 +0000 (14:36 +0100)]
Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 Oct 2015 13:30:18 +0000 (14:30 +0100)]
Merge branch 'MDL-51529-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 6 Oct 2015 13:14:27 +0000 (14:14 +0100)]
Merge branch 'MDL-51250_master-empty-return-fix' of git://github.com/dmonllao/moodle
David Monllao [Tue, 6 Oct 2015 03:39:39 +0000 (11:39 +0800)]
MDL-51250 course: No function returns in empty()
Dan Poltawski [Tue, 6 Oct 2015 13:02:45 +0000 (14:02 +0100)]
Merge branch 'MDL-51530-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Tue, 6 Oct 2015 12:42:13 +0000 (13:42 +0100)]
Merge branch 'MDL-51532-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 6 Oct 2015 12:39:26 +0000 (13:39 +0100)]
Merge branch 'MDL-51676-master-ltiservice_memberships' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 6 Oct 2015 12:38:27 +0000 (13:38 +0100)]
Merge branch 'MDL-51533-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 6 Oct 2015 11:22:57 +0000 (12:22 +0100)]
Merge branch 'MDL-51534-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 6 Oct 2015 11:14:02 +0000 (12:14 +0100)]
Merge branch 'MDL-51535-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:53:00 +0000 (11:53 +0100)]
Merge branch 'MDL-51538-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:51:51 +0000 (11:51 +0100)]
Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:42:17 +0000 (11:42 +0100)]
Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:41:01 +0000 (11:41 +0100)]
Merge branch 'MDL-51588-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:40:20 +0000 (11:40 +0100)]
Merge branch 'MDL-51578' of git://github.com/blaky/moodle
Dan Poltawski [Tue, 6 Oct 2015 10:25:21 +0000 (11:25 +0100)]
Merge branch 'MDL-51434_master-fix-unit-test' of git://github.com/dmonllao/moodle
David Monllao [Tue, 6 Oct 2015 04:14:32 +0000 (12:14 +0800)]
MDL-51434 mod_scorm: Including protectpackagedownloads in unit tests
David Monllao [Tue, 6 Oct 2015 07:24:18 +0000 (15:24 +0800)]
Merge branch 'MDL-51656_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 6 Oct 2015 05:39:36 +0000 (13:39 +0800)]
Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle
Andrew Nicols [Tue, 6 Oct 2015 05:16:42 +0000 (13:16 +0800)]
MDL-51461 javascript: Fix whitespace issue
Andrew Nicols [Tue, 6 Oct 2015 03:41:10 +0000 (11:41 +0800)]
Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle
Andrew Nicols [Tue, 6 Oct 2015 03:35:29 +0000 (11:35 +0800)]
Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 6 Oct 2015 02:42:55 +0000 (10:42 +0800)]
Merge branch 'MDL-50805_master' of https://github.com/crazyserver/moodle
David Monllao [Tue, 6 Oct 2015 02:30:00 +0000 (10:30 +0800)]
Merge branch 'MDL-51250-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 6 Oct 2015 02:25:30 +0000 (10:25 +0800)]
MDL-49811 mod_choice: Removing skipresultgraph link
The target of the link is not available after MDL-30816.
David Monllao [Tue, 6 Oct 2015 02:19:02 +0000 (10:19 +0800)]
Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle
David Monllao [Tue, 6 Oct 2015 01:28:03 +0000 (09:28 +0800)]
Merge branch 'master-MDL-49750' of git://github.com/jojoob/moodle
David Monllao [Tue, 6 Oct 2015 01:21:44 +0000 (09:21 +0800)]
Merge branch 'MDL-51434-master' of git://github.com/jleyva/moodle
David Mudrák [Tue, 6 Oct 2015 12:13:39 +0000 (14:13 +0200)]
MDL-51676 mod_lti: Mark LTI Memberships service as a standard plugin
Juan Leyva [Tue, 29 Sep 2015 08:59:05 +0000 (10:59 +0200)]
MDL-51564 webservice: Review the use of external format_string
Bence Laky [Thu, 1 Oct 2015 13:21:22 +0000 (14:21 +0100)]
MDL-51578 enrol_self: Improved error message on late/early enrolments
Simey Lameze [Tue, 6 Oct 2015 06:06:18 +0000 (14:06 +0800)]
MDL-45981 auth_cas: add cURL SSL versions dropdown
rajesh Taneja [Mon, 5 Oct 2015 02:52:12 +0000 (10:52 +0800)]
MDL-51660 behat: Upgarde behat and phpunit
1. Behat upgrade to 2.5.5
2. phpunit upgrade to 4.8.*
Jun Pataleta [Thu, 10 Sep 2015 08:55:05 +0000 (16:55 +0800)]
MDL-51250 course: Display the default section name
This patch makes the default section name appear in brackets
beside the 'Use default section name' checkbox.
Dan Poltawski [Mon, 5 Oct 2015 14:02:58 +0000 (15:02 +0100)]
Merge branch 'wip-MDL-49189-master' of https://github.com/kwiliarty/moodle
Dan Poltawski [Mon, 5 Oct 2015 13:59:16 +0000 (14:59 +0100)]
Merge branch 'wip-MDL-51636-master' of https://github.com/marinaglancy/moodle
jinhofer [Wed, 19 Aug 2015 16:05:07 +0000 (11:05 -0500)]
MDL-49811 lib: Added js to skiplinks
I have added a JS module to handle skiplinks to send
the focus to the end of the block. This improves the function
and allows the user to better tab through the page.
Dan Poltawski [Mon, 5 Oct 2015 10:47:52 +0000 (11:47 +0100)]
Merge branch 'MDL-51501-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 5 Oct 2015 09:44:37 +0000 (10:44 +0100)]
Merge branch 'wip-MDL-49028-master' of git://github.com/abgreeve/moodle