Commit graph

77138 commits

Author SHA1 Message Date
Dan Poltawski
6a9b3c5a48 Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle 2016-03-01 13:10:57 +08:00
Dan Poltawski
340d35a902 Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes 2016-03-01 13:03:06 +08:00
Andrew Nicols
c62413ace3 Merge branch 'MDL-48362-master-fix1' of http://github.com/damyon/moodle 2016-03-01 12:58:54 +08:00
Dan Poltawski
71ea84048d Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle 2016-03-01 12:53:10 +08:00
Dan Poltawski
de67ef599f Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle 2016-03-01 12:38:54 +08:00
Dan Poltawski
b23f27fdd2 Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle 2016-03-01 12:30:56 +08:00
Damyon Wiese
e3f24ac030 MDL-48362 enrol_cohort: Perform immediate sync on add/update instance
This restores backwards compatible behaviour.
2016-03-01 12:29:09 +08:00
Andrew Hancox
23b6636997 MDL-51687 mod_folder: Trigger event when downloading all files. 2016-03-01 12:27:55 +08:00
Dan Poltawski
792508cb7f Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle 2016-03-01 12:26:33 +08:00
Dan Poltawski
fd8e293030 Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle 2016-03-01 12:23:54 +08:00
Marina Glancy
17f53b45ab MDL-44952 mod_feedback: set value for hidenoselect if disabled 2016-03-01 12:21:00 +08:00
Andrew Nicols
cf633c555e MDL-30811 form: Remove continue from test. 2016-03-01 12:11:10 +08:00
Andrew Nicols
64d6465650 MDL-52974 mod_assign: Improve tests for view_submission_status
External tests only
2016-03-01 11:50:11 +08:00
Andrew Nicols
05b0f579ca Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle 2016-03-01 11:48:16 +08:00
Dan Poltawski
c116a115d9 Merge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle 2016-03-01 11:34:04 +08:00
Dan Poltawski
d76acc87f7 Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle 2016-03-01 10:43:12 +08:00
Andrew Nicols
57ecaf68b8 Merge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle 2016-03-01 10:40:27 +08:00
Dan Poltawski
9f82928bb6 Merge branch 'MDL-53050-forum-target' of https://github.com/brendanheywood/moodle 2016-03-01 10:38:55 +08:00
Dan Poltawski
25c0e10122 Merge branch 'MDL-53072_master' of git://github.com/markn86/moodle 2016-03-01 10:12:46 +08:00
Andrew Nicols
c25f0b4d27 Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle 2016-03-01 10:05:53 +08:00
Andrew Nicols
2b38214a16 Merge branch 'MDL-53214-master' of git://github.com/cameron1729/moodle 2016-03-01 09:40:44 +08:00
Eloy Lafuente (stronk7)
d9dfc410ad Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle 2016-03-01 01:59:31 +01:00
Andrew Nicols
80f79ad6ec Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle 2016-03-01 08:07:56 +08:00
Dan Poltawski
b70b436875 Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle 2016-02-29 16:34:22 +08:00
Dan Poltawski
c3717ca64e Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd8mz/moodle 2016-02-29 16:15:27 +08:00
Dan Poltawski
9b44810fbf Merge branch 'MDL-53213' of https://github.com/mr-russ/moodle 2016-02-29 15:37:25 +08:00
Andrew Nicols
7f1303728d Merge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle 2016-02-29 15:20:44 +08:00
Andrew Nicols
da45d10a51 MDL-48362 enrol: Correct singleselect use in behat test 2016-02-29 15:16:10 +08:00
Andrew Nicols
dfc18848db Merge branch 'MDL-48362-master' of git://github.com/damyon/moodle 2016-02-29 14:46:20 +08:00
Damyon Wiese
f758951565 MDL-48362 enrol: Convert guest to standard enrolment ui
Also - provide automatic course navigation links when using the standard ui.
2016-02-29 14:33:06 +08:00
Andrew Nicols
90a11c2abb Merge branch 'MDL-53249-master' of git://github.com/merrill-oakland/moodle 2016-02-29 14:22:31 +08:00
Andrew Nicols
ae3c6ee42d MDL-52346 caching: Coding style fixes 2016-02-29 14:14:01 +08:00
Andrew Nicols
8bd28ed696 Merge branch 'MDL-52346' of git://github.com/mr-russ/moodle 2016-02-29 14:12:03 +08:00
Damyon Wiese
51c736f037 MDL-48362 enrol: Auto generate the edit action icons when using the new ui 2016-02-29 14:00:31 +08:00
Dan Poltawski
17ac1b5349 Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle 2016-02-29 13:43:53 +08:00
Andrew Nicols
d96a4e2a59 MDL-53206 caching: Remove accidental use of fullresult variable 2016-02-29 13:20:29 +08:00
Damyon Wiese
60010fd614 MDL-48362 enrol: Use a standard UI and validation for enrolment plugins
Convert core enrolment plugins to use standard editing ui.
2016-02-29 12:31:41 +08:00
Dan Poltawski
57853ea8f9 Merge branch 'MDL-53208' of https://github.com/mr-russ/moodle 2016-02-29 10:29:09 +08:00
Dan Poltawski
7f02500bd8 Merge branch 'MDL-53154-master' of git://github.com/junpataleta/moodle 2016-02-29 10:13:06 +08:00
Andrew Nicols
0e8ce68a17 MDL-30811 core: Fix tests where continue button has been removed 2016-02-29 09:05:58 +08:00
Andrew Nicols
372d6b923b MDL-30811 core: Replace use of continue_button with redirect 2016-02-29 09:05:58 +08:00
Andrew Nicols
d954b54f9e MDL-30811 forum: Update use of redirect to include message and type 2016-02-29 09:05:57 +08:00
Andrew Nicols
3ad964190c MDL-30811 core: Make use of session notifications in redirect() 2016-02-29 09:05:57 +08:00
Andrew Nicols
0346323cec MDL-30811 output: Add support for session notifications 2016-02-29 09:05:56 +08:00
Rushikesh
4ac5ae6248 MDL-46424 Upload: Error message for a file exceeding maxsize 2016-02-29 08:59:02 +08:00
Andrew Nicols
a31d1e5726 Merge branch 'wip-MDL-52397-master' of git://github.com/abgreeve/moodle 2016-02-29 08:33:41 +08:00
Andrew Nicols
243468030a MDL-30811 output: Tidy up notifications 2016-02-28 19:16:34 +08:00
Russell Smith
d22a01fd99 MDL-53213 caching: Faster databasemeta caching for all databases. 2016-02-28 17:03:14 +11:00
Russell Smith
fdff8077e0 MDL-53208 caching: Update serialization rules for performance.
- We only now serialize when required, eg when the store doesn't do it.
- static acceleration now serializes on set to reduce overhead on load.
- null now works in static acceleration as we use an array for storage metadata
- static acceleration delete uses isset rather than an array_search.
2016-02-28 17:01:51 +11:00
Russell Smith
76349f871e MDL-53208 caching: Remove TTL wrapper on static acceleration.
TTL is only updated between script runs.  If it's valid
when it's added to static acceleration, it will be valid
for the entire script run.
2016-02-28 17:01:50 +11:00