22640 Commits

Author SHA1 Message Date
Dan Poltawski
de8388f529 Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle 2016-11-02 13:56:22 +00:00
Juan Leyva
2521afd2e8 MDL-56666 message: New WS core_message_get_user_message_preferences 2016-11-02 12:16:23 +00:00
Dan Poltawski
540b01b60d Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle 2016-11-02 09:36:09 +00:00
Damyon Wiese
b07981e1e1 MDL-56621 forms: Give a default value if format not set
For forms with a text area, we need to provide a default for the format.
This only affects boost because it is export_for_template.
2016-11-02 14:42:33 +08:00
Damyon Wiese
88e709ae43 MDL-56699 boost: Don't break when activities use onclick in nav
Boost templates were not nicely rendering onclick handlers in the navbar.
2016-11-02 13:35:54 +08:00
Andrew Nicols
c6ae02c184 Merge branch 'MDL-48468' of https://github.com/mr-russ/moodle 2016-11-02 10:13:42 +08:00
David Monllao
f5d9072e51 Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle 2016-11-02 09:14:09 +08:00
Damyon Wiese
9e2f13125a MDL-56161 boost: alignment static form elements
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.

Also use a span, not a label for unlabelable static form elements.
2016-11-02 09:06:12 +08:00
Juan Leyva
56c8413712 MDL-55992 webservice: Fix debugging notice when creating token
This patch also avoid to propagate to logs the private token as is done
in login/token.php
2016-11-01 21:26:40 +00:00
Dan Poltawski
b9703b8e05 Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle 2016-11-01 21:20:53 +00:00
Dan Poltawski
57911c1f40 Merge branch 'MDL-47162' of https://github.com/stronk7/moodle 2016-11-01 12:13:19 +00:00
Eloy Lafuente (stronk7)
f593e8271a MDL-47162 badges: site & profile badges do not have courseid
Because of that, we need to set the, now mandatory, SITEID for
those message events to be happy. This does not affect course or
activity badges, both coming with correct courseid.
2016-11-01 12:47:54 +01:00
Dan Poltawski
9f02188575 Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle 2016-11-01 11:35:36 +00:00
Dan Poltawski
9bf205fb73 Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle 2016-11-01 09:47:11 +00:00
Damyon Wiese
757f42cb15
MDL-56587 theme_boost: Align header items
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
2016-11-01 11:36:08 +08:00
Adrian Greeve
839b391f74 MDL-56489 Lib: force_settings_menu added to pagelib.
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
2016-11-01 10:00:12 +08:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Eloy Lafuente (stronk7)
8df0fb490b Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle 2016-10-31 20:25:31 +01:00
Eloy Lafuente (stronk7)
7aa17ce256 Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle 2016-10-31 19:47:40 +01:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Eloy Lafuente (stronk7)
c40a53775f Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle 2016-10-31 17:23:11 +01:00
Dan Poltawski
5ad34c43f6 Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle 2016-10-31 15:10:02 +00:00
Damyon Wiese
2259c0f078 MDL-56621 templates: Add missing example contexts 2016-10-31 21:27:52 +08:00
Damyon Wiese
6fb8a7ab7e MDL-56621 forms: Hide format menu if only one
This was a regression in the new templates for editors.
2016-10-31 15:06:50 +08:00
Andrew Nicols
0b03040605 Merge branch 'MDL-56501-master' of git://github.com/lameze/moodle 2016-10-31 14:10:37 +08:00
Simey Lameze
343ba16c31 MDL-56501 message: introduce new manageallmessaging capability 2016-10-31 14:09:03 +08:00
Andrew Nicols
de32120676 Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle 2016-10-31 14:02:27 +08:00
Andrew Nicols
42a372e20f Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle 2016-10-31 14:00:36 +08:00
Jun Pataleta
6af2ccda91 MDL-56577 core_form: Let other option attrs to be set in select elements 2016-10-31 12:19:21 +08:00
Frédéric Massart
77bec234e0 MDL-56282 enrol_meta: Fix error when editing existing instances
We had a few problems here.

1/ The auto complete element was displaying the picker though the
   field was frozen.
2/ Checking for existing enrolment including the courses chosen was
   not checking if the courses found were in the instance we edit.
3/ Upon creation we support multiple courses but when editing we
   should not expect more than the course in the instance being edited.
2016-10-31 12:15:02 +08:00
Russell Smith
a169739d5d MDL-56273 cache: Use cache initialise always.
purge_all() and purge_by_definition() look in the configuration
for which caches are available and then creates them to purge them.
The configuration stores the values used by initialise(), not
initialise_unit_test_instance() and would therefore fail to purge
all caches if they were not purged by another means.

In the case of filestore, it's purged by unit tests, in the case
of memcache(d), it purges the whole store when a single definition
is requested.

Therefore all configuration was moved into the configuration file
during unit tests and does not have any special override codes in
the unit test infrastructure.
2016-10-30 13:42:43 +11:00
Russell Smith
68b1e13094 MDL-48468 cache: Import Redis cachestore
This code was originally taken from; https://github.com/durana/moodle-cachestore_redis
Special thanks to Mark Nielsen and Adam Durana for their work on this.

Since the original import;
- Mode session support has been added.
- Some cleanup of names has been made.
- Data guarantee and references support was added.
2016-10-30 13:34:43 +11:00
Dani Palou
6d2f938cbd MDL-56637 ws: Add core_user_update_user_preferences to Mobile service 2016-10-28 12:40:18 +02:00
Simey Lameze
fd5797aa3b MDL-55799 inplace_editable: add form-control class to fields 2016-10-28 15:04:54 +08:00
Adrian Greeve
159c2c91be MDL-55927 auth_radius: Move to third party plugin. 2016-10-28 14:35:54 +08:00
Adrian Greeve
e0789335ee MDL-44467 lib: Unit test updates. 2016-10-28 13:27:00 +08:00
Adrian Greeve
9715f61a26 MDL-44467 lib: Fix return path to noreply.
Added code to show emails from users on controlled domains.
Moved admin settings from message_email to admin.
2016-10-28 13:27:00 +08:00
Damyon Wiese
e2c8fb8515 MDL-55215 forms: Pass options and correctly merge choices 2016-10-28 13:23:48 +08:00
Damyon Wiese
f7ed5cee30 MDL-56171 javascript: Make searchableselector wrap autocomplete
One less yui module.

Conflicts:
	lib/upgrade.txt
2016-10-28 13:13:22 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Damyon Wiese
0f13ffbc63 MDL-56297 theme_boost: Obey usefilepicker option
URL form fields support 'usefilepicker' option to show/hide the file picker in some forms.
2016-10-28 12:57:08 +08:00
Damyon Wiese
58488d0ff0 MDL-56462 boost: Fix assign grading options form
Classes attribute was not being honoured by all form element templates.
Formchangechecker was only looking for the ignoredirty class on the element,
in boost it is on the container.
Assign had specific styles to hide the submit buttons that were not matching in boost.
2016-10-28 12:24:50 +08:00
Marina Glancy
761ef5d33a MDL-56615 portfolio: fix php 7.0.9 warning 2016-10-28 11:56:42 +08:00
Jun Pataleta
a78d184c05 MDL-55825 core_lib: LTI tool provider library fixes
* Define consumer profile member variable for ToolConsumer class
* Added context type property for Context class
* Set context type if 'context_type' parameter was submitted through POST

This commit can be dropped once the pull requests for these changes have
been integrated upstream.
2016-10-28 10:10:43 +08:00
Eloy Lafuente (stronk7)
a29bcf7819 MDL-47162 core_message: debug whenever courseid is missing
Instead of silently defaulting to SITEID when courseid (coming
from message_send()/\core\message\manager::send_message()) is missing,
now a debugging message is shown to allow developers to fix their
messages to, always, include courseid.

Raw creation of events via message_sent::create() missing other[courseid]
leads to coding exception since now (there shouldn't be any legacy use, as far as
they are always created via create_from_ids() when sending a message.

Updated upgrade.txt notes a little bit, added references the 3.6 final
deprecation issue (MDL-55449) and covered with unit tests.
2016-10-28 00:30:02 +02:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Dan Poltawski
1810eb1bf8 Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle"
This reverts commit aaa2788e42361b5e3032feacd9c0534fe47cb69c, reversing
changes made to 80b74762c9dad6c5127115f7146cfdf46ad70ab4.
2016-10-27 09:59:38 +01:00
Frédéric Massart
b24212515c MDL-55732 theme_boost: Export elements separator in groups 2016-10-27 10:54:02 +08:00
Damyon Wiese
bff9fd896a MDL-56597 theme_boost: Maintenance warning styles 2016-10-27 10:41:42 +08:00