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
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
05f97c615c
Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
2015-08-19 19:14:00 +02:00
a9334960dd
Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
2015-08-19 18:30:33 +02:00
839b8c3905
Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle
2015-08-19 18:30:33 +02:00
215c5cf5c2
MDL-46387 shifter: missing built changes
2015-08-19 18:30:32 +02:00
bf4253d772
Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle
2015-08-19 18:30:31 +02:00
b1da1e289b
Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle
2015-08-19 18:30:31 +02:00
c47a48d8f5
Merge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/moodle
2015-08-19 18:30:29 +02:00
edd6e9ebe2
Merge branch 'MDL-51102-master' of git://github.com/andrewnicols/moodle
2015-08-19 18:30:27 +02:00
556decf159
MDL-50801 atto_table: Allow caption position to be set
2015-08-19 09:02:45 +08:00
0305798c62
MDL-30315 gradebook: Uploading feedback doesn't override grades.
2015-08-18 17:02:45 +08:00
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
c7d17be417
Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle
2015-08-17 14:24:57 +01:00
2394cf72d6
Merge branch 'wip-MDL-50303-master' of git://github.com/marinaglancy/moodle
2015-08-17 15:06:15 +08:00
f3e77a5ea5
Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle
2015-08-17 14:56:14 +08:00
6df0e78849
Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle
2015-08-17 14:21:00 +08:00
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
068f1fce33
Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle
2015-08-17 09:44:53 +08:00
fd76204a8b
Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle
2015-08-17 08:50:49 +08:00
2f62ae82a1
MDL-46387 editor_atto: Add behat test for sub/sup
2015-08-16 15:10:02 -05:00
89a73b0815
MDL-51077 Availability: Date restriction unit test static not cleared
2015-08-14 10:51:29 +01:00
97b1a48204
MDL-47449 completion: Ignore timemodified when comparing
2015-08-14 10:53:20 +08:00
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
d78613701c
MDL-49841 testing: Correct composer incantation
2015-08-14 10:27:53 +08:00
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
04c24a55ec
MDL-50723 core: Remove long-defunct table webdav_locks
2015-08-14 08:42:34 +08:00
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
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
ddf4e69762
MDL-50923 theme: add missing content-only css class
2015-08-13 16:55:18 +08:00
d245f6757d
MDL-51102 behat: Add a non-JS version of wait
2015-08-13 15:56:22 +08:00
a039418383
MDL-50303 cache: removed unused cache definition
2015-08-13 11:56:53 +08:00
317fd6fe56
MDL-51100 behat: Correct javascript requirement of user menu step
2015-08-13 08:35:17 +08:00
28a614a83f
Merge branch 'MDL-50371' of https://github.com/danielneis/moodle
2015-08-13 00:38:41 +02:00
a3c9174b3d
MDL-50791 forms: make server validation errors accessible
2015-08-12 13:23:08 +08:00
6413794018
Merge branch 'MDL-37864-master' of git://github.com/xow/moodle
2015-08-12 09:35:46 +08:00
f2e50523d1
Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
2015-08-12 08:32:11 +08:00
3718d2cd17
Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
2015-08-12 08:30:03 +08:00
ede96605ac
Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
2015-08-12 08:23:29 +08:00
20c50b0d5c
Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle
2015-08-12 01:52:04 +02:00
b7759a1889
Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle
2015-08-11 23:44:50 +02:00
789d40a803
Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle
2015-08-11 22:58:09 +02:00
5222ab7f4b
MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present
2015-08-11 10:42:08 -06:00
27479b5cc9
MDL-51053 Restore: Static cache breaks unit tests
2015-08-11 14:07:38 +01:00
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
8c497d8d9f
Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle
2015-08-11 13:08:11 +08:00
dd106c8824
MDL-37864 lib: Change help for headers to match existing table api
2015-08-11 12:18:21 +08:00
edbea936c5
MDL-37864 lib: corrections to help icon in tables
2015-08-11 12:18:21 +08:00
3fed76e4df
MDL-37864 lib: Help icon work correctly in table header with sorting
2015-08-11 12:18:20 +08:00
c8bde450a1
MDL-50307 auth_db: Fix associative fetching in ADODB 2.19
2015-08-11 12:11:43 +08:00
Damyon Wiese