Dan Poltawski
ccee2dc2c5
MDL-44712 readme: fix trailing whitespace
2016-08-22 10:51:34 +01:00
Dan Poltawski
4d67694b10
Merge branch 'master_MDL-44712' of git://github.com/danmarsden/moodle
2016-08-22 10:33:31 +01:00
Dan Poltawski
a55ff4d9fe
Merge branch 'MDL_55423_master' of https://github.com/alexandru-elisei/moodle
2016-08-22 09:26:28 +01:00
Dan Poltawski
cf6ae1205e
Merge branch 'wip-MDL-22183-master' of git://github.com/abgreeve/moodle
2016-08-22 09:19:59 +01:00
Adrian Greeve
3b873397e6
MDL-22183 lib: More unit tests for next day start.
2016-08-18 10:13:31 +08:00
Adrian Greeve
3cdc35b44d
MDL-22183 lib: Cleanup of get_next functions.
2016-08-18 10:13:31 +08:00
Adrian Greeve
4ae0691169
MDL-22183 lib: Time settings removed for stats cron.
...
Old settings that should be ignored have been removed from the
statistics cron code.
2016-08-18 10:13:31 +08:00
Dan Marsden
b30a884bfa
MDL-44712 SCORM: Improve multi-sco activity completion.
2016-08-18 10:14:40 +12:00
Alexandru Elisei
03856ac5e8
MDL-55423 accesslib: Prevent get_role_users() false debugging messages
2016-08-17 20:43:39 +03:00
Dan Poltawski
3ca3cc77a2
weekly release 3.2dev
2016-08-17 14:47:04 +01:00
Dan Poltawski
40a952bf0f
MDL-55585 bump versions
2016-08-17 12:12:00 +01:00
Dan Poltawski
e3c9de6831
Merge branch 'MDL-55585_master' of git://github.com/dmonllao/moodle
2016-08-17 12:10:22 +01:00
Andrew Nicols
5019f9fd79
Merge branch 'wip-MDL-50586-master-fix' of https://github.com/marinaglancy/moodle
2016-08-17 13:22:50 +08:00
Marina Glancy
a87b2d70ec
MDL-50586 gradingform_rubric: 0-level warning during redirection
2016-08-17 12:59:02 +08:00
Andrew Nicols
72d088f229
Merge branch 'MDL-54973_master-fix' of git://github.com/dmonllao/moodle
2016-08-17 12:57:41 +08:00
David Monllao
df762928f6
MDL-54973 message: Taking care of support and noreply users on search
2016-08-17 12:41:48 +08:00
Andrew Nicols
b4bb1e65dc
Merge branch 'MDL-55445-master-2nd' of git://github.com/FMCorz/moodle
2016-08-17 11:25:24 +08:00
Frederic Massart
aa6b41293f
MDL-55445 theme: Clean and More automatically use the branding logos
...
But in order to maintain smooth backwards compatibility, the logos
set in the themes themselves take precedence.
2016-08-17 10:26:31 +08:00
Frederic Massart
2258b4dc41
MDL-55445 core: New setting to host the logos
2016-08-17 10:26:31 +08:00
Frederic Massart
19efee14e2
MDL-55445 files: Helper functions related to serving and caching
...
The function send_content_uncached() is meant to be used when serving
content which should not be cached by browsers/proxies. You will
use this in development mode, or when the request is malformed
but you need to return some fallback content which shouldn't be stored
under the URL it was requested from.
The function file_safe_save_content() should only be used for content
not stored in the file API. Good candidates for this are resource
which fit well in the localcache. The function tries to write the
content in the most atomic way as possible to prevent incomplete
writes or concurrent writes.
2016-08-17 10:26:10 +08:00
Dan Poltawski
5fb09e48ce
Merge branch 'MDL-55130-master' of git://github.com/crazyserver/moodle
2016-08-16 12:48:00 +01:00
Dan Poltawski
d6e7b38844
Merge branch 'MDL-36713_m32v2' of https://github.com/sbourget/moodle
2016-08-16 12:04:18 +01:00
David Monllao
0c417cdc5c
MDL-55585 search: Remove missing report/search file
2016-08-16 17:50:19 +08:00
Andrew Nicols
9d8a3055c0
Merge branch 'MDL-55272' of https://github.com/mr-russ/moodle
2016-08-16 14:55:49 +08:00
Andrew Nicols
ccfd62a1ca
MDL-54680 enrol_lti: Coding Style fixes
2016-08-16 14:48:17 +08:00
Andrew Nicols
88a0cdada4
Merge branch 'MDL-54680-master' of https://github.com/xow/moodle
2016-08-16 14:45:33 +08:00
John Okely
3e9ab40361
MDL-54680 enrol_lti: Offer cartridges in LTI provider
2016-08-16 14:15:02 +08:00
Damyon Wiese
bb0b39b839
MDL-55520 forms: Properly format the grademax for the database
2016-08-16 11:19:51 +08:00
Andrew Nicols
c544236647
Merge branch 'wip-MDL-18592-fix' of git://github.com/marinaglancy/moodle
2016-08-16 10:47:53 +08:00
Marina Glancy
f32a984db7
MDL-18592 mod_choice: deprecate incorrect events
2016-08-16 10:43:54 +08:00
Russell Smith
6a3acc84de
MDL-55272 lib: Improve test course create performance
...
Use core functions that are faster for test file creation.
To support large requests for hashes, the core hash function
must support large hashes without recursion. PHP has a default
recursion depth of 100 and long hashes don't support this.
Remove transactions as they create performance problems for larger
courses and doesn't introduce significant benefit for developers.
Performance changes meant the times were much faster, a reasonable
guess was taken on performance of an average machine.
2016-08-16 12:00:21 +10:00
Stephen Bourget
67a1f63913
MDL-36713 Blog: Display accurate error when a guest views a user blog
2016-08-15 21:46:48 -04:00
Andrew Nicols
6677f64f8c
Merge branch 'wip-MDL-50586-master' of git://github.com/marinaglancy/moodle
2016-08-16 08:52:17 +08:00
Andrew Nicols
1824951eef
Merge branch 'MDL-54973_master' of https://github.com/dg711/moodle
2016-08-16 08:21:13 +08:00
Andrew Nicols
e144182592
MDL-54647 tests: Clarify unoconv tests
2016-08-16 08:11:13 +08:00
Andrew Nicols
0a0eaa7dfc
Merge branch 'MDL-54647-master' of git://github.com/damyon/moodle
2016-08-16 08:01:47 +08:00
Dan Poltawski
c6970e9c16
Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle
2016-08-15 14:27:34 +01:00
Pau Ferrer Ocaña
c13c21b9b5
MDL-55130 wiki: Reduce data usage when only renew lock is needed.
2016-08-15 14:40:38 +02:00
Dan Poltawski
8d37a33b16
Merge branch 'wip-MDL-55494-master' of git://github.com/marinaglancy/moodle
2016-08-15 13:15:15 +01:00
Dan Poltawski
fb8723d9f5
MDL-52105 enrol_self: fix upgrade savepoint
2016-08-15 12:12:24 +01:00
Dan Poltawski
16d7b6b133
Merge branch 'MDL-55196_master' of https://github.com/andrewhancox/moodle
2016-08-15 12:00:47 +01:00
Dan Poltawski
338fd5dd57
Merge branch 'wip-MDL-55366-master' of git://github.com/abgreeve/moodle
2016-08-15 11:44:09 +01:00
Dan Poltawski
e4346dad32
Merge branch 'wip-mdl-55380' of https://github.com/rajeshtaneja/moodle
2016-08-15 11:38:34 +01:00
Dan Poltawski
2595cb58c9
Merge branch 'wip-MDL-55397-master' of git://github.com/marinaglancy/moodle
2016-08-15 11:35:35 +01:00
Dan Poltawski
5e17cd21aa
Merge branch 'MDL-52105-master' of git://github.com/lameze/moodle
2016-08-15 11:13:27 +01:00
Dan Poltawski
21b6554e2a
Merge branch 'MDL-55533_multiresponse_feedback' of git://github.com/davosmith/moodle
2016-08-15 11:09:51 +01:00
Dan Poltawski
623f92f9f7
Merge branch 'MDL-46214-master' of git://github.com/andrewnicols/moodle
2016-08-15 09:47:02 +01:00
Damyon Wiese
36ba9c3e76
MDL-54647 tests: Reverse order of expected and actual
2016-08-15 16:34:11 +08:00
Damyon Wiese
300852ee30
MDL-54647 file_storage: Redo the test pdf every time it's viewed
2016-08-15 16:32:21 +08:00
Andrew Nicols
40cc0ba04e
Merge branch 'MDL-55513-master' of https://github.com/lucisgit/moodle
2016-08-15 14:07:41 +08:00
