Mark Nelson
9f468b1b31
MDL-51782 mod_forum: moved post_deleted event into function
2015-10-14 18:21:28 -07:00
Dan Poltawski
b117fac04b
weekly release 3.0dev
2015-10-14 10:49:01 +01:00
Dan Poltawski
8780d80e80
NOBUG: Fixed file access permissions
2015-10-14 10:49:01 +01:00
Dan Poltawski
cfa945308d
NOBUG: Fixed SVG browser compatibility
2015-10-14 10:49:00 +01:00
Dan Poltawski
4d9edf1b15
MDL-51536 webservices: fix invalid param definitions
2015-10-13 19:01:42 +01:00
Dan Poltawski
6333b018ad
Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle
2015-10-13 15:44:31 +01:00
Dan Poltawski
3975c5bc2e
Merge branch 'MDL-51435' of https://github.com/NeillM/moodle
2015-10-13 11:39:52 +01:00
Dan Poltawski
e3b03886d0
MDL-47494 copyright: missed fixes from last commit
...
With thanks to Tim!
2015-10-13 09:55:28 +01:00
Dan Poltawski
bf47ddbdf3
MDL-47494 copyright: fix incorrect statement
...
(From copy/paste error, blame Tim :P)
2015-10-13 09:39:28 +01:00
Dan Poltawski
08d93936f4
Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
2015-10-13 09:23:31 +01:00
Damyon Wiese
ab848fea81
MDL-48861 assign: Make the requires grading filter consistent
...
Consistently include submissions with a null grade (see MDL-47694).
2015-10-13 14:52:50 +08:00
Damyon Wiese
fb6bae3eae
MDL-48861 assign: Fix unit tests and behat tests
...
The tests were not working with the change to the needs grading filter.
2015-10-13 12:59:13 +08:00
David Monllao
ee58df52da
Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle
2015-10-13 11:42:40 +08:00
Andrew Nicols
5e2547612f
Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle
2015-10-13 11:33:23 +08:00
Andrew Nicols
a6c0702884
Merge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/moodle
2015-10-13 11:05:05 +08:00
Andrew Nicols
da113979bd
Merge branch 'MDL-51517_master' of git://github.com/lazydaisy/moodle
2015-10-13 10:33:32 +08:00
Andrew Nicols
3648d7963a
Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle
2015-10-13 10:13:43 +08:00
David Monllao
09d62af419
Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle
2015-10-13 10:11:55 +08:00
Ryan Wyllie
4b596728e7
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.
2015-10-13 01:46:25 +00:00
Andrew Nicols
ac1f81a187
Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle
2015-10-13 09:45:41 +08:00
Adrian Greeve
59d20e706a
MDL-49515 libraries: Update to editpdf/classes/pdf.php
...
This updates fpdi_bridge to extend our Moodle pdf class
as was done before.
2015-10-13 09:28:16 +08:00
Andrew Nicols
8775bc4d40
Merge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle
2015-10-13 09:24:31 +08:00
Andrew Nicols
29caaeff9e
Merge branch 'MDL-50788-master' of git://github.com/danpoltawski/moodle
2015-10-13 08:08:51 +08:00
Dan Poltawski
576a0cc3ab
Merge branch 'MDL-51375' of git://github.com/timhunt/moodle
2015-10-12 17:01:41 +01:00
Dan Poltawski
37029775f9
Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle
2015-10-12 16:53:18 +01:00
Dan Poltawski
45f2e27c4d
Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
2015-10-12 12:41:03 +01:00
Dan Poltawski
668980be3e
Merge branch 'MDL-51536-master' of git://github.com/damyon/moodle
2015-10-12 11:47:45 +01:00
Dan Poltawski
0015ec87d6
Merge branch 'MDL-51586-master' of git://github.com/xow/moodle
2015-10-12 10:47:13 +01:00
David Monllao
fd47ef44bd
Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle
2015-10-12 17:08:27 +08:00
David Monllao
fb7b835cdd
Merge branch 'MDL-51083-master' of git://github.com/xow/moodle
2015-10-12 16:57:06 +08:00
Dan Poltawski
30b86ccb68
Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle
2015-10-12 09:46:00 +01:00
Damyon Wiese
ac82a9a8b4
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).
2015-10-12 16:41:02 +08:00
Juan Leyva
4f3a2d2103
MDL-51637 forum: Make forum_get_discussions_paginated return group post
2015-10-12 10:08:17 +02:00
Juan Leyva
e8ad99ab91
MDL-51568 self_enrol: New Web Service enrol_self_enrol_user
2015-10-12 09:13:51 +02:00
Andrew Nicols
fe26df5ec9
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.
2015-10-12 14:54:34 +08:00
Andrew Nicols
34ab6b314f
Merge branch 'MDL-51528-int-fix-1' of https://github.com/ryanwyllie/moodle
2015-10-12 14:15:14 +08:00
David Monllao
1c94483300
MDL-49682 mod_forum: Bump version for caches
2015-10-12 14:07:55 +08:00
David Monllao
66116cf5c4
Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
2015-10-12 14:05:02 +08:00
Ryan Wyllie
106bbb8592
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.
2015-10-12 05:45:13 +00:00
Andrew Nicols
99690e0fa8
MDL-46497 atto: Whitespace/coding style fix
2015-10-12 13:37:29 +08:00
Andrew Nicols
56b62992fa
Merge branch 'MDL-46497_master' of https://github.com/nadavkav/moodle
2015-10-12 13:35:24 +08:00
Andrew Nicols
317938393c
MDL-49682 mod_forum: Build forum email templates
2015-10-12 13:26:29 +08:00
Andrew Nicols
8a64346270
Merge branch 'MDL-51528-master' of git://github.com/ryanwyllie/moodle
2015-10-12 10:42:15 +08:00
David Monllao
b60abb8486
Merge branch 'MDL-51524-master' of git://github.com/andrewnicols/moodle
2015-10-12 10:36:05 +08:00
Andrew Nicols
c0ea3a71fc
Merge branch 'MDL-51451-master' of https://github.com/sammarshallou/moodle
2015-10-12 10:10:51 +08:00
Mark Nelson
607021c14b
MDL-46455 events: added more mapping
...
Also fixed a few bugs.
2015-10-11 18:52:36 -07:00
Andrew Nicols
44250050dc
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.
2015-10-12 09:35:59 +08:00
Andrew Nicols
ec2d33dfcd
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.
2015-10-12 09:35:58 +08:00
Damyon Wiese
3d0fff3a83
MDL-46455 restore: Add debug messages when log records cannot be mapped
2015-10-11 18:14:59 -07:00
Damyon Wiese
e17b739995
MDL-46455 logstores: Do not try and map empty fields on restore.
2015-10-11 18:14:58 -07:00
