Commit graph

22692 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
cfe55553e0 Merge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle 2016-10-17 18:12:33 +02:00
Dan Poltawski
2ee939fb19 Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle 2016-10-17 11:01:27 +01:00
Andrew Nicols
f0f4c1939c MDL-55175 course: Begin deprecation process for pring_log_* 2016-10-17 11:08:20 +08:00
Adrian Greeve
f34d7af0ae MDL-55087 lib: Update to htmlpurifier lib. 2016-10-17 08:43:41 +08:00
Adrian Greeve
b36b997b7f MDL-55087 lib: Update htmlpurifier to v4.8.0. 2016-10-17 08:43:41 +08:00
Juan Leyva
961c95499e MDL-45639 tool_mobile: Support auto-login from the app to the site
We din't call it SSO because:
- SSO usually requires a 3rd party for authentication
- SSO term is already used in tool_mobile when supporting using auth methods like CAS or Shibboleth
2016-10-14 12:32:37 +01:00
Juan Leyva
69cbe35943 MDL-45639 webservice: Support private tokens
Private tokens are generated at the same time that the token.
They must be stored safely by the ws client, and they must be transmitted only via  https.
2016-10-14 12:32:30 +01:00
Dan Poltawski
0a51a20928 MDL-55510 upgrade: remove repository_alfresco config
This was missing from MDL-49533 and caused a complaint about alfresco
on every upgrade.
2016-10-14 09:41:31 +01:00
Dan Poltawski
f60c7eae73 MDL-56436 mustache: update import docs 2016-10-14 08:31:23 +01:00
acorbier
1b372a77a5
MDL-56369 behat: Updated comment for i_look_for_exceptions
After upgrade to Behat 3.x, i_look_for_exception is called from
Moodle\BehatExtension\EventDispatcher\Tester\ChainedStepTester
2016-10-14 13:22:04 +08:00
Eloy Lafuente (stronk7)
1c56029fa4 Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle 2016-10-13 19:35:48 +02:00
Rajesh Taneja
c5a566dc15 MDL-55522 behat: Commented failing transformations
- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959
2016-10-13 19:35:45 +02:00
Cameron Ball
3aa8696ce6 MDL-56095 output: Properly set prototype on custom event for IE 2016-10-13 19:32:09 +02:00
Juan Leyva
e86f0cb4a1 MDL-55393 message: New WS get_user_notification_preferences 2016-10-13 19:32:06 +02:00
Juan Leyva
53522c6e38 MDL-55393 message: Add some external functions to mobile service 2016-10-13 19:32:05 +02:00
Eloy Lafuente (stronk7)
c405d31bef Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle 2016-10-13 19:32:05 +02:00
Eloy Lafuente (stronk7)
403b817857 Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle 2016-10-13 19:32:04 +02:00
Marina Glancy
62a3c42947 MDL-56110 forms: debug message for php 7.1 compat
Follow up for MDL-55123
2016-10-13 09:18:34 +08:00
Matt Davidson
b7374faca6 MDL-43230 badges: manually revoke awarded badges
A user can be manually awarded a badge, but if given by mistake an
awarded badge cannot be removed.
2016-10-12 05:06:38 +00:00
David Monllao
b805d3f8ef MDL-56057 search: Fix incorrectly reported no enabled search areas
Also improved performance caching enabled search areas and
all search areas at the same time.
2016-10-12 08:30:23 +08:00
Eloy Lafuente (stronk7)
a34625a17c Merge branch 'MDL-55345' of https://github.com/paulholden/moodle 2016-10-11 17:06:17 +02:00
Dan Poltawski
34930e37cd MDL-54682 deprecatedlib: fix trailing whitespace 2016-10-11 13:17:42 +01:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Eloy Lafuente (stronk7)
537054ec27 Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle 2016-10-11 11:54:23 +02:00
David Monllao
b65c33ace5 Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle 2016-10-11 17:11:21 +08:00
Mark Nelson
d4b2c195e1 MDL-54682 core: build amd modules 2016-10-11 14:39:24 +08:00
Ryan Wyllie
963ba88970 MDL-56234 message: fix messaging UI in theme boost 2016-10-11 14:39:24 +08:00
Ryan Wyllie
14617a566b MDL-56292 message: mustache template docs 2016-10-11 14:39:23 +08:00
Ryan Wyllie
8b99e16358 MDL-56292 core: add note to upgrade.txt for context_header change 2016-10-11 14:39:23 +08:00
Ryan Wyllie
7d69958e6b MDL-56292 message: move popover code into output plugin 2016-10-11 14:39:23 +08:00
Ryan Wyllie
f8e4145feb MDL-56292 core: change size of 'component' DB column 2016-10-11 14:39:22 +08:00
Eloy Lafuente (stronk7)
db43b23848 Merge branch 'wip-MDL-27072-master' of https://github.com/Beedell/moodle 2016-10-11 02:42:02 +02:00
Eloy Lafuente (stronk7)
6bf8e9b021 Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle 2016-10-11 01:21:14 +02:00
Eloy Lafuente (stronk7)
45dd1dc052 Merge branch 'MDL-53695-master' of git://github.com/danpoltawski/moodle 2016-10-10 18:25:18 +02:00
Eloy Lafuente (stronk7)
f0077d4c42 Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle 2016-10-10 18:11:56 +02:00
David Monllao
97f1af7575 Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle 2016-10-10 23:14:43 +08:00
David Monllao
886207f70e Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle 2016-10-10 22:57:34 +08:00
Dan Poltawski
5f85134187 Merge branch 'MDL-55999-master' of git://github.com/lameze/moodle 2016-10-10 13:40:16 +01:00
Dan Poltawski
0b7aef7b20 Merge branch 'MDL-51584' of https://github.com/mr-russ/moodle 2016-10-10 13:23:59 +01:00
Dan Poltawski
1573c3031b MDL-53695 lib/javascript.php: ensure full env for core_minify
This applies the same approach to generating minified js as is already
used in theme/javascript.php and other scripts. When we need to do the
minification, we load the full Moodle environment, so we can use the
libraries.

The reason this was required was because now the minifier uses
autoloaded classes, which are not autoloaded when doing
ABORT_AFTER_CONFIG.

Fred persuaded me that it's probably safer to keep it that way, rather
than alllow ABORT_AFTER_CONFIG scripts from autoloading the world and
their dog (especially for resource serving scripts, they are intended to
be lightweight when serving from cache).
2016-10-10 13:17:04 +01:00
Dan Poltawski
4cb24aa9d7 MDL-53695 minify: switch to MatthiasMullie\Minify
The previously used minification libraries were:
a) Unmaintained
b) Had some silly licensing issues (MDL-36457)

The new library is smaller, maintained, active and GPL-compatible.
2016-10-10 13:17:04 +01:00
Frédéric Massart
fc72f49da3 MDL-56095 output: Moving progress_bar from weblib to outputcomponents
And revert the change in the order of the require_once in setup.php.
2016-10-10 13:25:37 +02:00
John Beedell
10c4fce520 MDL-27072 Quiz: Remove get_users_by_capability from quiz reports 2016-10-10 11:05:15 +01:00
Dan Poltawski
80156d01c4 Merge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle 2016-10-10 10:09:46 +01:00
Frédéric Massart
d195128300 MDL-56005 adminlib: Display saved value in colourpicker 2016-10-10 11:00:00 +02:00
Frédéric Massart
258143e34d MDL-56005 output: Support prepending SCSS code instead of variables only 2016-10-10 10:59:52 +02:00
David Monllao
e8cd446ecd Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle 2016-10-10 16:59:06 +08:00
Andrew Nicols
3a4c497c15 MDL-52051 oauth: expires_in is optional 2016-10-10 14:02:20 +08:00
Ryan Wyllie
a92eda4b26 MDL-56292 core: make popover region event bindings on open 2016-10-10 12:48:52 +08:00
Ryan Wyllie
2d552f37b8 MDL-56292 core: auto_rows should fire event on element 2016-10-10 12:48:52 +08:00