Marina Glancy
3145f21de1
MDL-31436 registration: do not send false in update request
2017-12-14 16:05:45 +13:00
Andrew Nicols
4b162c766d
Merge branch 'M3.4-MDL-59866' of https://github.com/marcusboon/moodle into MOODLE_34_STABLE
2017-12-12 13:47:54 +08:00
Marcus Boon
7da0e04ca3
MDL-59866 session: Add retry for redis sessions
...
There is an edge case whereby redis will fail
to accept connections on the first try but
retrying the connection seems to make it work
Included in this commit:
* Retry functionality in the session init
2017-12-12 14:48:26 +10:00
Andrew Nicols
91406c9103
Merge branch 'MDL-60983_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE
2017-12-12 10:57:55 +08:00
Damyon Wiese
60e57b8448
Merge branch 'wip-MDL-45500-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE
2017-12-11 13:14:05 +08:00
Damyon Wiese
af9b21a388
Merge branch 'MDL-54106-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
2017-12-11 11:38:04 +08:00
Luca Bösch
ac66136751
MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed
2017-12-08 14:12:49 +01:00
Tim Hunt
5617f26568
MDL-60983 get_user_capability_course: fix buggy edge cases
...
There were basically two problems, which are demostrated by
the new test users u7 and u8 in the unit test.
1. There was a problem if a role was overridden in a context above the
one where it was assigned. E.g. User has teacher role in a course, and
there is a role override in the course-category context. That was being
ignored.
2. Problems with the handling of PROHIBITs. It should be the case that
if there is a PROHIBIT in force, then it cannot be overridden by another
role, or by a role override. However, this was not working in all cases.
Also, I had to add comments to the unit test so that I could understand
it. Hopefully these will be hepful to other developers too.
2017-12-08 12:07:27 +00:00
Marina Glancy
be4ea98f29
MDL-31436 hub: never use xmlrpc, always use REST
2017-11-30 11:27:41 +08:00
Marina Glancy
e71a526011
MDL-45500 gradingform: allow plugin uninstall
2017-11-28 12:27:26 +08:00
yair.spielmann
afcb4cd69a
MDL-59512 tool_oauth2: add option for basic authentication
2017-11-17 10:22:01 +01:00
Andrew Nicols
b9fd516407
MDL-60361 calendar: Support all event types for calendar subs
2017-11-03 11:27:40 +08:00
Andrew Nicols
d8966238dd
Merge branch 'wip-MDL-60569-master' of git://github.com/marinaglancy/moodle
2017-10-31 10:15:56 +08:00
Ryan Wyllie
4febb36efe
MDL-59936 calendar: use icons in event summary modal
2017-10-30 08:33:54 +08:00
David Monllao
a272c25649
Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle
2017-10-26 18:33:49 +02:00
Mark Johnson
a9ca3fa167
MDL-60600 core_output: Clear static icon system cache between unit tests
2017-10-26 14:59:35 +01:00
Jun Pataleta
1fc642324a
Merge branch 'MDL-59909-master' of git://github.com/damyon/moodle
2017-10-26 21:09:12 +13:00
Andrew Nicols
9fd91f8eec
Merge branch 'master-MDL-51892' of https://github.com/fwsl/moodle
2017-10-26 11:08:50 +08:00
Damyon Wiese
a66de3ca70
MDL-59909 calendar: Try hard not to fail the adhoc task.
...
Triggering a fatal error in an adhoc task is bad. It will be retried indefinitely.
Even though we are not sure how to get a module instance without a course module record,
it is possible and should not kill the Moodle site.
2017-10-25 15:42:14 +08:00
Marina Glancy
13e7626834
MDL-60569 registration: fix bug with showing email in the form
2017-10-25 15:12:43 +08:00
Grzegorz Ziółek
5fd7c11d17
MDL-51892 logging: Proper description of login errors.
2017-10-24 11:00:05 +02:00
Andrew Nicols
2a31e628f1
MDL-57477 session: Comment tidyup
2017-10-24 08:12:02 +08:00
Andrew Nicols
79d3a1bc1e
Merge branch 'MDL-57477' of https://github.com/appalachianstate/moodle
2017-10-24 08:04:54 +08:00
Fred Woolard
bd035b98fd
MDL-57477 core: If memcached 3.x mimic 2.2.0 lock acquisition behavior
2017-10-23 13:45:47 -04:00
Andrew Nicols
b01232671e
Merge branch 'MDL-60388_master' of git://github.com/dmonllao/moodle
2017-10-23 10:00:41 +08:00
David Monllao
6e98bca0ba
MDL-60388 analytics: Any write action looking at all contexts below course
2017-10-20 13:20:46 +02:00
Marina Glancy
690168cb4a
MDL-60108 registration: do not offer registration in behat tests
2017-10-20 14:35:31 +08:00
David Monllao
b6b299ddae
Merge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle
2017-10-19 09:12:34 +02:00
Jun Pataleta
4ee428fbe2
Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle
2017-10-19 15:20:39 +13:00
Simey Lameze
cbc6794d02
MDL-60372 calendar: fix font awesome event type icons
2017-10-19 09:06:25 +08:00
Andrew Nicols
ff7081150b
Merge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle
2017-10-19 09:01:58 +08:00
David Monllao
fefa34120a
MDL-59063 analytics: Finished courses can't be used for prediction
2017-10-17 14:05:40 +02:00
David Monllao
b1a9a6a19a
Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle
2017-10-17 09:45:44 +02:00
Marina Glancy
1095afa4f7
MDL-60108 registration: Redirect to registration form
...
- when first installed
- when manual update of registration information is required
2017-10-17 15:00:17 +08:00
Marina Glancy
af925a541d
MDL-60108 registration: Simplify, add commnews and separate emails
2017-10-17 15:00:14 +08:00
Jake Dallimore
0d3bdbe4af
Merge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle
2017-10-17 14:27:31 +08:00
Andrew Nicols
0b53be9056
Merge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle
2017-10-17 12:00:51 +08:00
Jun Pataleta
4f53f3f571
Merge branch 'MDL-58713-master' of git://github.com/jleyva/moodle
2017-10-17 09:03:08 +08:00
Juan Leyva
dc78f150fa
MDL-58713 filters: Support auto-loading in the filters component
2017-10-16 10:25:17 +02:00
John Okely
f7e6fb04db
MDL-46269 tool_httpsreplace: Make standard plugin & add to settings
2017-10-16 16:11:14 +08:00
Andrew Nicols
6af34eb5bf
Merge branch 'wip-MDL-60194-master' of git://github.com/abgreeve/moodle
2017-10-16 14:10:18 +08:00
Jun Pataleta
5be8c8daa6
Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle
2017-10-16 12:10:51 +08:00
Marina Glancy
484b43f456
MDL-60281 general: create_function is deprecated in PHP7.2
2017-10-16 09:37:19 +08:00
Andrew Nicols
e61ad18e70
Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle
2017-10-12 11:28:04 +08:00
sam marshall
74b7a42d0d
MDL-55356 core_search: Make indexing task/CLI do context requests
2017-10-11 17:17:10 +01:00
sam marshall
d761b3fb19
MDL-55356 core_search: API to check if indexing enabled
...
New function \core_search\manager::is_indexing_enabled(), analagous
to existing is_global_search_enabled().
This replaces existing duplicated code, ready for more use in
following commits.
2017-10-11 17:17:06 +01:00
Damyon Wiese
f4594a22ec
Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2017-10-10 17:32:47 +08:00
Jake Dallimore
8fbc41d8d5
MDL-37361 completion: minor code fixes.
2017-10-10 17:12:09 +08:00
Eiz Eddin Al Katrib
a39918daae
MDL-37361 completion: Enabled overriding activity completion status
2017-10-10 17:10:15 +08:00
Damyon Wiese
93effd739f
Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle
2017-10-10 13:05:31 +08:00