mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 17:33:18 +02:00
Code Issues Projects Releases Wiki Activity
75,585 Commits 36 Branches 529 Tags
Commit Graph

20728 Commits

Author SHA1 Message Date
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
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
668980be3e Merge branch 'MDL-51536-master' of git://github.com/damyon/moodle 2015-10-12 11:47:45 +01:00
Dan Poltawski
30b86ccb68 Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle 2015-10-12 09:46:00 +01: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
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
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
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
Lior Gil
2209309e2c MDL-46497 Atto: Fix adding redundant p elements in rtl/ltr actions 2015-10-10 01:36:48 +03:00
Dan Poltawski
cc75779fb4 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.
 2015-10-09 11:23:32 +01:00
Dan Poltawski
0496ac6305 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.
 2015-10-09 10:36:59 +01:00
Damyon Wiese
b3c10f9fb2 MDL-51605 Atto: Fix deprecation warnings from upgraded rangy 2015-10-09 15:42:10 +08:00
Dan Poltawski
8dd00c98f2 NOBUG: Fixed file access permissions 2015-10-08 11:36:35 +01:00
Dan Poltawski
21dcd2daf3 Merge branch 'MDL-51523_master' of git://github.com/markn86/moodle 2015-10-08 11:30:54 +01:00
David Monllao
dc9afaba4f MDL-51623 core_event: Updating error messages 2015-10-08 15:57:46 +08:00
David Monllao
02c85f9934 Merge branch 'MDL-51623_parent_event' of git://github.com/moodlerooms/moodle 2015-10-08 15:53:00 +08:00
Eloy Lafuente (stronk7)
b82a60d1a7 Merge branch 'MDL-51624-master' of git://github.com/jleyva/moodle 2015-10-08 01:18:39 +02:00
Eloy Lafuente (stronk7)
11e2efe941 Merge branch 'MDL-51566-master' of git://github.com/jleyva/moodle 2015-10-08 00:24:06 +02:00
Dan Poltawski
99133d0c47 Merge branch 'MDL-51531-master' of git://github.com/damyon/moodle 2015-10-07 16:39:13 +01:00
Juan Leyva
4bed1682bb MDL-51624 mod_lti: New Web Service mod_lti_view_lti 2015-10-07 14:54:18 +02:00
Juan Leyva
4b93c3e342 MDL-51566 mod_choice: New WS mod_choice_delete_choice_responses 2015-10-07 13:58:51 +02:00
Dan Poltawski
cae31eccfd Merge branch 'MDL-50543-master' of git://github.com/jleyva/moodle 2015-10-07 11:36:21 +01:00
sam marshall
a0ef17628a 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.
 2015-10-07 10:24:25 +01:00
David Monllao
68c3db8f5f Merge branch 'MDL-51537-master' of git://github.com/lameze/moodle 
Conflicts:
	lib/upgrade.txt
 2015-10-07 14:14:21 +08:00
David Monllao
ff93a2a6f3 Merge branch 'MDL-51526-master' of git://github.com/cameron1729/moodle 2015-10-07 13:46:40 +08:00
Cameron Ball
ec9e2d0414 MDL-51526 mail: Import PHPMailer 5.2.13 2015-10-07 13:42:40 +08:00
David Monllao
d30255a08d Merge branch 'MDL-51579-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-10-07 12:48:03 +08:00
Andrew Nicols
bbad52793b Merge branch 'wip-MDL-41042-master' of git://github.com/marinaglancy/moodle 2015-10-07 10:25:56 +08:00
Marina Glancy
5667e60249 MDL-41042 coursecat: reset course contacts cache more often 2015-10-07 10:23:03 +08:00
Marina Glancy
a6d4a36388 MDL-41042 coursecat: better handle changes in coursecontact 2015-10-07 10:15:19 +08:00
David Monllao
0646f596f5 Merge branch 'MDL-51521-master' of git://github.com/cameron1729/moodle 2015-10-07 09:32:13 +08:00
David Monllao
7f9e70beaf Merge branch 'MDL-51525-master' of git://github.com/ryanwyllie/moodle 2015-10-07 09:22:31 +08:00
David Monllao
af17e8d9dd Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle 2015-10-07 09:20:13 +08:00
Eloy Lafuente (stronk7)
b8e0dcbb7e Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle 2015-10-07 01:12:17 +02:00
Dan Poltawski
f5e68c2892 Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:55 +01:00
Dan Poltawski
13371605ed Merge branch 'MDL-51530-master' of git://github.com/ryanwyllie/moodle 2015-10-06 16:32:35 +01:00
Dan Poltawski
4ed45a18d1 Merge branch 'MDL-51532-master' of git://github.com/damyon/moodle 2015-10-06 16:32:23 +01:00
Dan Poltawski
828d23646a Merge branch 'MDL-51676-master-ltiservice_memberships' of git://github.com/mudrd8mz/moodle 2015-10-06 16:32:04 +01:00
Dan Poltawski
3228365b12 Merge branch 'MDL-51533-master' of git://github.com/damyon/moodle 2015-10-06 16:32:04 +01:00
Dan Poltawski
615c7f1923 Merge branch 'MDL-51534-master' of git://github.com/junpataleta/moodle 2015-10-06 16:32:03 +01:00
Dan Poltawski
a5bde1f85f Merge branch 'MDL-51535-master' of git://github.com/junpataleta/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
6b58b264db Merge branch 'MDL-51538-master' of git://github.com/damyon/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
8d49ad2613 Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle 2015-10-06 16:32:02 +01:00
Dan Poltawski
d540aa8c70 Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:00 +01:00