mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 06:31:22 +01:00
Code Issues Projects Releases Wiki Activity
75,590 Commits 36 Branches 527 Tags
Commit Graph

75590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
lazydaisy
8d9410bd4f MDL-51517 theme_bootstrapbase: Clean up buttons.less 2015-10-10 11:02:38 +01: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
John Okely
d5994d38c9 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.
 2015-10-09 15:34:39 +08:00
Damyon Wiese
64f6ef1f3a 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.
 2015-10-09 15:08:06 +08:00
Adrian Greeve
858d457d61 MDL-49515 libraries: Update FPDI to 1.5.4 2015-10-09 14:46:12 +08:00
Ryan Wyllie
49ee2d0d2a 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.
 2015-10-09 06:34:43 +00:00
Ryan Wyllie
a25baf3184 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.
 2015-10-09 06:22:49 +00:00
Ryan Wyllie
abe2e8ed9b 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.
 2015-10-09 06:22:49 +00:00
Mifsud Gaël
f209d5e1be MDL-51083 admin: Prevent password autofill in authentication settings 2015-10-09 14:04:34 +08:00
Eric Merrill
12f946d999 MDL-36606 gradereport: Update AJAX grader to understand gradeless cells 2015-10-08 12:33:08 -04:00
Andrew Robert Nicols
df65120a75 MDL-36606 gradereport: Correctly handle ungraded assessment ajax grading 2015-10-08 09:51:22 -04:00
Barbara Ramiro
0381520262 MDL-40442 Icon: Improved svg download icon and png version 2015-10-08 13:31:03 +01:00
Dan Poltawski
74fad2ce3d weekly release 3.0dev 2015-10-08 11:36:35 +01:00
Dan Poltawski
8dd00c98f2 NOBUG: Fixed file access permissions 2015-10-08 11:36:35 +01:00
Dan Poltawski
e58ca6b640 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-10-08 11:36:33 +01:00
Dan Poltawski
21dcd2daf3 Merge branch 'MDL-51523_master' of git://github.com/markn86/moodle 2015-10-08 11:30:54 +01:00