Dan Poltawski
e90d0c90b4
MDL-56514 message: fix whitespace
2016-10-31 10:06:26 +00:00
Dan Poltawski
868f5c8709
Merge branch 'MDL-56514-master' of git://github.com/lameze/moodle
2016-10-31 10:03:59 +00:00
Dan Poltawski
703863ce82
Merge branch 'MDL-56599-master' of git://github.com/damyon/moodle
2016-10-31 09:57:03 +00:00
Dan Poltawski
b7f3b1365d
Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle
2016-10-31 09:35:21 +00:00
Dan Poltawski
75de2e6199
Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle
2016-10-31 09:10:06 +00:00
Simey Lameze
a2c7227ab8
MDL-56514 core_message: add missing is messaging enabled checks
2016-10-31 15:06:50 +08:00
Damyon Wiese
ad785e699e
MDL-56631 passwordunmask: Admin setting for password unmask not working
...
Andrew refactored the way it rendered the element, but did not update all the
templates (there is mforms element AND admin settings element).
See 3778a9226f
2016-10-31 14:45:07 +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
Andrew Nicols
711e2ab184
Merge branch 'MDL-56583-master' of git://github.com/crazyserver/moodle
2016-10-31 13:42:46 +08:00
Russell Smith
f9599c77cc
MDL-56273 cache: Ensure requirements are met for cache stores.
...
Ensure that the cache store requirements are met prior to attempting
to instantiate a class. Many of the constructors create connections
to external services requiring the installation and availability of
classes that are specified in are_requirements_met(). If they are
not checked properly you end up with PHP Fatal errors rather than
falling back to a different store that is capabable without the
the extra classes loaded.
2016-10-31 16:04:51 +11: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
Andrew Nicols
4e5d96ee3a
Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle
2016-10-31 12:18:22 +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
Andrew Nicols
c86fb21789
Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle
2016-10-31 12:03:00 +08:00
Andrew Nicols
09a05b798b
MDL-56138 messaging: Add tests for viewparticipants search restriction
2016-10-31 11:58:29 +08:00
Andrew Nicols
46dd48129b
Merge branch 'wip-MDL-56138-master' of git://github.com/abgreeve/moodle
2016-10-31 11:35:47 +08:00
Andrew Nicols
cf6fc0abe1
Merge branch 'MDL-56638-master' of git://github.com/crazyserver/moodle
2016-10-31 11:01:25 +08:00
Adrian Greeve
87d4ab654b
MDL-56138 messaging: Update to messaging unit tests.
2016-10-31 10:52:05 +08:00
Adrian Greeve
f324957724
MDL-56138 messaging: Limit course search to enrolled courses.
2016-10-31 10:52:05 +08:00
Andrew Nicols
72c0d69d5c
Merge branch 'wip-MDL-56625-master' of git://github.com/abgreeve/moodle
2016-10-31 10:47:29 +08:00
Andrew Nicols
236778b905
MDL-56078 theme_boost: Update ignorefiles
2016-10-31 10:46:14 +08:00
Andrew Nicols
43dadab50b
Merge branch 'MDL-56078-master' of git://github.com/damyon/moodle
2016-10-31 09:30:15 +08:00
Andrew Nicols
bcabf4d530
Merge branch 'MDL-56427-master' of git://github.com/lameze/moodle
2016-10-31 09:16:10 +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
Pau Ferrer Ocaña
1f84c2c5ea
MDL-56638 assign: Don't check sesskey using submit_grading_form from WS
2016-10-28 13:44:19 +02:00
Dan Poltawski
85c9053aec
Merge branch 'MDL-56339-master' of git://github.com/junpataleta/moodle
2016-10-28 09:47:15 +01:00
Adrian Greeve
1d4490d366
MDL-56625 authentication: Email registration works again.
...
Creation via email accounts was broken due to a missing
require for the auth library.
2016-10-28 11:17:28 +08:00
Jun Pataleta
f30f627501
MDL-56339 enrol_lti: Force page layout to embedded from custom setting
2016-10-28 10:05:02 +08:00
Jun Pataleta
59eb63612b
MDL-56573 enrol_lti: Non-null default for tool_consumer_instance_name
2016-10-28 10:03:19 +08:00
Pau Ferrer Ocaña
59111fa937
MDL-56583 assign: Add info about the user submission capability
2016-10-27 15:40:03 +02:00
Dan Poltawski
577bd70d38
weekly release 3.2dev
2016-10-27 12:19:27 +01:00
Dan Poltawski
2062b6de90
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-10-27 12:19:25 +01:00
Dan Poltawski
1810eb1bf8
Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle"
...
This reverts commit aaa2788e4280b74762c9
2016-10-27 09:59:38 +01:00
Eloy Lafuente (stronk7)
6a17bdec92
Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle
2016-10-27 10:47:51 +02:00
Simey Lameze
4a7fdb4abb
MDL-56427 message: style fixes for notification and message preferences
2016-10-27 15:27:11 +08:00
Andrew Nicols
77cfc19a85
Merge branch 'MDL-56015-master-fix1' of http://github.com/damyon/moodle
2016-10-27 15:12:49 +08:00
Andrew Nicols
ce434c7664
Merge branch 'wip-mdl-55074-fix2' of https://github.com/rajeshtaneja/moodle
2016-10-27 12:16:43 +08:00
Rajesh Taneja
0fa66b5383
MDL-55074 behat: Remove js tag as the feature can run without it
2016-10-27 12:11:45 +08:00
Damyon Wiese
58473a6776
MDL-56015 theme_boost: change theme preview screenshot
2016-10-27 09:20:35 +08:00
Eloy Lafuente (stronk7)
6f01090159
Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle
2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57
MDL-56448 mustache: fix json errors in example context
2016-10-26 12:35:45 +01:00
Dan Poltawski
2300b95dbf
Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle
2016-10-26 12:11:56 +01:00
Dan Poltawski
add9db49f4
MDL-56334 tests: add some trivial cases to domain tests
...
This gets us to 100% code coverage.
2016-10-26 09:58:05 +01:00
Dan Poltawski
e376b4bd64
Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle
2016-10-26 09:57:50 +01:00
Damyon Wiese
11774d9014
MDL-56599 theme_boost: Move region settings menu out of content div
...
This is because the content div has it's own rules for scrolling and overflow,
and they don't work well with the action menu for the region.
2016-10-26 16:46:29 +08:00
Eloy Lafuente (stronk7)
c64230234f
Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle
2016-10-26 10:38:36 +02:00
Adrian Greeve
020c98e373
MDL-56334 libraries: Addition of domain checker.
...
Added a function for checking if a domain is allowed
against a list of domains that could contain wildcards.
2016-10-26 15:51:32 +08:00
