20417 Commits

Author SHA1 Message Date
Dan Poltawski
4d9845426e Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle 2015-08-24 10:25:32 +01:00
David Monllao
259bd67ce9 Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle 2015-08-24 15:29:58 +08:00
Marina Glancy
ba2ad4316e MDL-51184 themes: correctly check $CFG->svgicons
Thanks to Ralf Wiederhold for pointing out the bug
2015-08-24 11:06:24 +08:00
Damyon Wiese
e0d08bfa5d MDL-51116 Mustache: Caching issue exists with mustache templates
The first ajax load fetches the template and puts it in localstorage + a js var

The second load gets it from local storage, but does not put it in the js var.

The pix_icon helper expects it to be in the js var always.
2015-08-24 10:50:40 +08:00
David Monllao
bcd58d9ff7 MDL-50801 atto_table: Caption node might not be present
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
2015-08-20 15:25:44 +08:00
Damyon Wiese
85fa6a9305 MDL-50150 Mustache: Update to 2.9.0 version of mustache.php
And enable the BLOCKS pragma (we need it for reusable templates).
2015-08-20 11:44:56 +08:00
Damyon Wiese
841e689a1c MDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine.
Pull request: https://github.com/janl/mustache.js/pull/473
2015-08-20 11:44:49 +08:00
Eloy Lafuente (stronk7)
05f97c615c Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle 2015-08-19 19:14:00 +02:00
Dan Poltawski
a9334960dd Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle 2015-08-19 18:30:33 +02:00
Eloy Lafuente (stronk7)
839b8c3905 Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:33 +02:00
Dan Poltawski
215c5cf5c2 MDL-46387 shifter: missing built changes 2015-08-19 18:30:32 +02:00
Dan Poltawski
bf4253d772 Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle 2015-08-19 18:30:31 +02:00
Dan Poltawski
b1da1e289b Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:31 +02:00
Dan Poltawski
c47a48d8f5 Merge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:29 +02:00
David Monllao
edd6e9ebe2 Merge branch 'MDL-51102-master' of git://github.com/andrewnicols/moodle 2015-08-19 18:30:27 +02:00
David Monllao
556decf159 MDL-50801 atto_table: Allow caption position to be set 2015-08-19 09:02:45 +08:00
Adrian Greeve
0305798c62 MDL-30315 gradebook: Uploading feedback doesn't override grades. 2015-08-18 17:02:45 +08:00
Andrew Nicols
2300a312a4 MDL-33365 core: Move JS output to body
It turns out that, after all these years, we've been doing it wrong.
The YUI Loader should be loaded at the top of the body, not in the head.

Having it in the head means that the body has not yet loaded, and we see
a number of minor issues for scripts which happen very early in the load
process. One of these is the creation of invalid HTML from the YUI loader
because it is not able to insert in the body as it has not yet been
created.

To be safe, we must move all JS to the same point (because of unknown
dependencies between them). These should be placed as early in the body as
possible.

We also change the way in which the legacy YUI css modules are loaded.
2015-08-18 15:48:55 +08:00
Dan Poltawski
c7d17be417 Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle 2015-08-17 14:24:57 +01:00
David Monllao
2394cf72d6 Merge branch 'wip-MDL-50303-master' of git://github.com/marinaglancy/moodle 2015-08-17 15:06:15 +08:00
David Monllao
f3e77a5ea5 Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle 2015-08-17 14:56:14 +08:00
David Monllao
6df0e78849 Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle 2015-08-17 14:21:00 +08:00
Bruce Silver
edd99023a6 MDL-50962 user: Profile fields display properly
The department and idnumber fields were not displaying
properly on the user profile pages.
2015-08-17 10:33:05 +08:00
David Monllao
068f1fce33 Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle 2015-08-17 09:44:53 +08:00
David Monllao
fd76204a8b Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle 2015-08-17 08:50:49 +08:00
Daniel Thies
2f62ae82a1 MDL-46387 editor_atto: Add behat test for sub/sup 2015-08-16 15:10:02 -05:00
sam marshall
89a73b0815 MDL-51077 Availability: Date restriction unit test static not cleared 2015-08-14 10:51:29 +01:00
Andrew Nicols
97b1a48204 MDL-47449 completion: Ignore timemodified when comparing 2015-08-14 10:53:20 +08:00
Andrew Nicols
504c97925c MDL-47449 phpunit: Add comparitor for isEqual with exceptions
We often do isEqual tests but where a field, may have a single exception.
Ordinarily we can handle this easily by breaking the test down, but when
dealing with mocked objects we can only pass an instance of a
PHPUnit_Framework_Constraint, or a single value (which is cast to an
instance of PHPUnit_Framework_Constraint_IsEqual).

To deal with instances of time-based exception, we need to be able to
compare simple objects and classes where one or two values may be
different.
2015-08-14 10:53:19 +08:00
Andrew Nicols
d78613701c MDL-49841 testing: Correct composer incantation 2015-08-14 10:27:53 +08:00
Jun Pataleta
0c4c3b9aed MDL-44828 filelib: Fix open error for force-downloaded files in mobile
Allow guessing of file's MIME type by default. Fallback to
application/octet-stream if MIME type cannot be determined.
2015-08-14 09:54:20 +08:00
Daniel Thies
dc9ca4acea MDL-46387 editor-atto: Toggle sub/sup tags using rangy
In order to have a consistant browser behavior and prevent nesting of
subscripts and superscripts, tags are converted to CSS classes and then
the CSS classes in the selection are toggeled using the rangy crossbrowser
selection library already included in Atto without using an execCommand.
2015-08-13 15:46:29 -05:00
Dan Poltawski
5f92c736e3 MDL-51110 badges: prevent duplicate award of badges
Previously duplicate users could be returned when they had
done duplicate badge criteria - this would lead to a duplicate
constraint being hit as they were attempted to be awarded twice.
2015-08-13 13:21:03 +01:00
Andrew Nicols
d245f6757d MDL-51102 behat: Add a non-JS version of wait 2015-08-13 15:56:22 +08:00
Marina Glancy
a039418383 MDL-50303 cache: removed unused cache definition 2015-08-13 11:56:53 +08:00
Andrew Nicols
317fd6fe56 MDL-51100 behat: Correct javascript requirement of user menu step 2015-08-13 08:35:17 +08:00
Eloy Lafuente (stronk7)
28a614a83f Merge branch 'MDL-50371' of https://github.com/danielneis/moodle 2015-08-13 00:38:41 +02:00
David Monllao
6413794018 Merge branch 'MDL-37864-master' of git://github.com/xow/moodle 2015-08-12 09:35:46 +08:00
David Monllao
f2e50523d1 Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle 2015-08-12 08:32:11 +08:00
David Monllao
3718d2cd17 Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle 2015-08-12 08:30:03 +08:00
David Monllao
ede96605ac Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle 2015-08-12 08:23:29 +08:00
Eloy Lafuente (stronk7)
20c50b0d5c Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle 2015-08-12 01:52:04 +02:00
Eloy Lafuente (stronk7)
b7759a1889 Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle 2015-08-11 23:44:50 +02:00
Eloy Lafuente (stronk7)
789d40a803 Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle 2015-08-11 22:58:09 +02:00
Sam Chaffee
5222ab7f4b MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present 2015-08-11 10:42:08 -06:00
sam marshall
27479b5cc9 MDL-51053 Restore: Static cache breaks unit tests 2015-08-11 14:07:38 +01:00
David Balch
9dcd50358a MDL-50839 user_menu: Allow themes to set User menu avatar size.
Added an @array "options" parameter to user_get_user_navigation_info(),
for passing in avatarsize, and possibly other options in future.

Also removed an errant parameter in the /lib/outputrenderers.php
user_get_user_navigation_info() call, as there was no corresponding
parameter in the function definition.

(Test written by Jetha Chan.)
2015-08-11 13:57:17 +01:00
David Monllao
8c497d8d9f Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle 2015-08-11 13:08:11 +08:00
John Okely
dd106c8824 MDL-37864 lib: Change help for headers to match existing table api 2015-08-11 12:18:21 +08:00
Marina Glancy
edbea936c5 MDL-37864 lib: corrections to help icon in tables 2015-08-11 12:18:21 +08:00