Commit graph

80696 commits

Author SHA1 Message Date
Dan Poltawski
4ac1bb2f34 Merge branch 'MDL-55605-lesson-restore-bug' of https://github.com/kenneth-hendricks/moodle 2016-08-22 14:13:26 +01:00
Dan Poltawski
74a53156d6 Merge branch 'MDL-55551_m32v1' of https://github.com/sbourget/moodle 2016-08-22 12:53:31 +01:00
Dan Poltawski
293857b5eb Merge branch 'MDL-55557_m32v1' of https://github.com/sbourget/moodle 2016-08-22 12:45:18 +01:00
Dan Poltawski
6f9f149b04 MDL-44712 scorm: make upgrade match install.xml defintion 2016-08-22 12:40:03 +01:00
Andrew Nicols
8381ac52cd MDL-46654 mod_forum: Remove irrelevant digest/subscribe options
If the user cannot subscribe, there is no point showing the digest options.
2016-08-22 19:12:20 +08:00
Andrew Nicols
d6c05ad1f1 MDL-46654 mod_forum: Hide digestoptions when no subscription
Daily digest options should not be generated if the user cannot subscribe
to anything in the first place.
2016-08-22 19:06:06 +08:00
Dan Poltawski
cfbba4a94c Merge branch 'MDL-54864-master' of https://github.com/snake/moodle 2016-08-22 11:19:32 +01:00
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
Jake Dallimore
d7d4a09707 MDL-54864 core_question: Enforce context,stamp uniqueness for category
Added an upgrade step to remove duplicate stamps, added a unique index
on (contextid, stamp) and modified the question_category edit code such
that stamp duplication in the same context is not permitted.
2016-08-22 09:44:52 +08:00
Brendan Heywood
657ddbf592 MDL-55273 admin: Change $CFG->cookiesecure default to on 2016-08-22 09:20:32 +10:00
Tim Hunt
12a725be10 MDL-55477 quiz reports: all user fields should have repeats suppressed 2016-08-19 18:04:51 +01:00
Dan Poltawski
217ef85633 MDL-55391 block_rss: fix typo preventing feed title display 2016-08-19 09:43:32 +01:00
Devang Gaur
2af9ad7d30 MDL-55127 mod_data: added database entries to globalsearch 2016-08-19 13:58:19 +05:30
An Pham Van
d0207fdc06 MDL-54838 workshop: Differentiate labels for each comment field.
In a Workshop activity, comment fields on Assessment forms do not properly link to the corresponding Aspect.
So screen reader users may find it difficult to complete the Assessment forms.
There should be a hidden label text for each comment field.
2016-08-19 13:44:19 +07:00
Andrew Nicols
2e48384dea MDL-55632 mod_forum: Tidy up forum post messages 2016-08-19 09:38:57 +08:00
Rajesh Taneja
e99f0cbba6
MDL-55072 behat: refactor behat_config_manager 2016-08-19 06:49:13 +08:00
Rajesh Taneja
39eb8abe15
MDL-46514 behat: Delete tablesupdatedbyscenario before suite
Delete tablesupdatedbyscenario before db reset to ensure
db is fully reset. In case user exits or process terminated
then the file will be left and can lead to wrong results
2016-08-19 06:46:27 +08:00
Rajesh Taneja
43759f5e23
MDL-46514 behat: Catch errors shown by JS 2016-08-19 06:46:27 +08:00
Kenneth Hendricks
504b65d2e5 MDL-55605 mod_lesson: Fix activitylinks restore bug 2016-08-18 16:35:34 +10:00
Jake Dallimore
d8e73d61b9 MDL-55565 core_backup: Fix warning when restoring question categories
Fixed a call to get_records_sql, which was being used incorrectly in
restore_find_best_target_context to determine a unique contextid.
2016-08-18 10:15:51 +08: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