0856b75fb6
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-03-10 20:59:34 +01:00
34f5a23e6a
MDL-55956 mod_assign: Do not use API constant in upgrade
2017-03-10 18:04:50 +00:00
aabe41f359
Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle
2017-03-10 18:04:49 +00:00
ac40d8b589
MDL-57596 forms: CLEANHTML in persistent forms
...
Add special handling for text fields with the CLEANHTML type. This should
be used when students and teachers can edit the same field (you can't trust those students).
Applies cleaning on submitted data, and on data stored in the DB before it is put back in an editing form.
2017-03-10 18:04:48 +00:00
5f399bcf55
MDL-55956 mod_assign: Set priorities of old assign event overrides
2017-03-10 18:04:48 +00:00
6e65554ea1
MDL-58010 user: allow to update only whitelisted user preferences
2017-03-10 18:04:47 +00:00
77f591831c
MDL-57557 theme_boost: tweak js popover settings
...
Added the focus trigger to non hover popovers so that they close when
they lose focus.
Also added a 500ms delay to hiding the hover triggered popover to give
time for clicking on the contents.
2017-03-10 18:04:47 +00:00
91b2bf2c9d
MDL-55956 core: Update major db change version
2017-03-10 18:04:46 +00:00
5286837617
Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle
2017-03-10 18:04:46 +00:00
ef607980cf
Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle
2017-03-10 18:04:45 +00:00
c742c61956
Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle
2017-03-10 18:04:44 +00:00
e2310e4361
Merge branch 'MDL-57975-master' of git://github.com/ryanwyllie/moodle
2017-03-10 18:04:42 +00:00
4e0cad1cbd
Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle
2017-03-10 18:03:53 +00:00
d8a70ba35f
Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle
2017-03-10 18:03:53 +00:00
1523d53bdc
Merge branch 'MDL-58035' of git://github.com/timhunt/moodle
2017-03-10 18:03:52 +00:00
58d85af209
MDL-56526 userlib: Do not allow not loggedin users if forceloginforprofile is set
2017-03-10 18:03:52 +00:00
6f5a433c95
MDL-56526 globalsearch: Fix bug in phpdocs
2017-03-10 18:03:51 +00:00
6f88c26864
MDL-57597 competency: Fix serving of prior learning evidence files
...
For security reasons, all files submitted by students must be disposed
as attachments, not inline contents.
2017-03-10 18:03:51 +00:00
1abfa3a95e
MDL-58217 mod_feedback: Add data generators for items
2017-03-10 10:51:51 +01:00
5bbada53e3
MDL-58217 mod_feedback: API changes to allow generators
...
We include a new function set_date at item level so we can add the data
instead using the forms.
2017-03-10 10:51:32 +01:00
357712eabe
MDL-55528 assignfeedback_editpdf: Remove unnecessary escapes
2017-03-10 10:45:47 +08:00
3bd0d4397c
MDL-55528 assignfeedback_editpdf: Add step to check all pages loaded
2017-03-10 10:45:46 +08:00
f7a9f1dd0e
MDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv
2017-03-10 10:45:46 +08:00
1568168717
MDL-55528 fileconverter_unoconv: Add new unoconv plugin
...
AMOS BEGIN
MOV [pathtounoconv,admin],[pathtounoconv,fileconverter_unoconv]
MOV [pathtounoconv_help,admin],[pathtounoconv_help,fileconv_helperter_unoconv_help]
MOV [unoconvwarning,admin],[unoconvwarning,fileconverter_unoconv]
MOV [test_unoconv,assignfeedback_editpdf],[test_unoconv,fileconverter_unoconv]
MOV [test_unoconvempty,assignfeedback_editpdf],[test_unoconvempty,fileconverter_unoconv]
MOV [test_unoconvdoesnotexist,assignfeedback_editpdf],[test_unoconvdoesnotexist,fileconverter_unoconv]
MOV [test_unoconvdownload,assignfeedback_editpdf],[test_unoconvdownload,fileconverter_unoconv]
MOV [test_unoconvisdir,assignfeedback_editpdf],[test_unoconvisdir,fileconverter_unoconv]
MOV [test_unoconvnotestfile,assignfeedback_editpdf],[test_unoconvnotestfile,fileconverter_unoconv]
MOV [test_unoconvnotexecutable,assignfeedback_editpdf],[test_unoconvnotexecutable,fileconverter_unoconv]
MOV [test_unoconvok,assignfeedback_editpdf],[test_unoconvok,fileconverter_unoconv]
MOV [test_unoconvversionnotsupported,assignfeedback_editpdf],[test_unoconvversionnotsupported,fileconverter_unoconv]
AMOS END
2017-03-10 10:45:46 +08:00
34df779a95
MDL-55528 core_files: Create new fileconverter plugintype
2017-03-10 09:31:14 +08:00
2dfec31ef5
Automatically generated installer lang files
2017-03-10 00:04:10 +08:00
832a18a46a
MDL-58177 tasks: Refactor scheduled task gui to use NO_OUTPUT_BUFFERING
2017-03-09 11:21:49 +00:00
8ddc656739
MDL-57658 calendar: Fix rrulemanager and unit tests
...
Issues fixed:
* Additional rule validations.
* Rewrote recurrence logic.
* Additional unit tests, especially from the examples in the RFC.
* The date format "YmdThis" results into an incorrect date for the
"UNTIL" parameter. The literal "T" should be escaped, and a literal
"Z" is also needed at the end of the format string to indicate UTC.
* Implemented handling of negative modifier values for BYxxx rules.
* Implemented handling of BYWEEKNO, BYYEARDAY, BYSETPOS, BYHOUR,
BYMINUTE, BYSECOND rules.
2017-03-09 16:10:08 +08:00
c6dd683cd0
MDL-47354 gradereport_singleview: allow choice of 'perpage' values
2017-03-08 11:39:29 +00:00
f113169573
MDL-55956 calendar: Include courses parameter in subquery conditions
2017-03-08 15:30:04 +08:00
373029ec33
MDL-57975 core: version bump
...
Part of MDL-55611
2017-03-08 03:33:24 +00:00
8fa8675de8
MDL-57975 core: add userdate mustache php helper
...
Part of MDL-55611
2017-03-08 03:33:24 +00:00
0e5b3e282f
MDL-57975 javascript: add userdate mustache js helper
...
Part of MDL-55611
2017-03-08 03:33:24 +00:00
b61015cfcd
MDL-57975 javascript: add user_date.js
...
Part of MDL-55611
2017-03-08 03:33:23 +00:00
9c7ffb80d3
MDL-57975 core: test for user date external function
...
Part of MDL-55611
2017-03-08 03:33:23 +00:00
88c2941b26
MDL-57975 core: add get user date external function
...
Part of MDL-55611
2017-03-08 03:33:23 +00:00
c0f70d1a7a
MDL-57751 libraries: Remove <2.6 only check from load_installed_plugins
2017-03-08 08:37:36 +08:00
228637feff
Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle
2017-03-07 14:00:07 -03:00
305ecff614
Automatically generated installer lang files
2017-03-08 00:05:35 +08:00
21521604af
Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle
2017-03-07 16:36:54 +01:00
6dba6a5a6a
Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle
2017-03-07 11:12:32 -03:00
7ebe17f38a
Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle
2017-03-07 11:08:24 -03:00
58798ecb52
Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle
2017-03-07 11:07:47 -03:00
56068f5972
MDL-58035 tool_templatelibrary: fix unit test using removed base theme
2017-03-07 13:35:06 +00:00
ea049ee618
MDL-58035 lib: log when the expected theme cannot be initialised
2017-03-07 13:29:46 +00:00
58f7a83036
Merge branch 'MDL-58106' of git://github.com/timhunt/moodle
2017-03-07 13:37:24 +01:00
2aa1855205
Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle
2017-03-07 13:15:55 +01:00
68aab93ea5
Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle
2017-03-07 13:13:51 +01:00
e7d380ca40
MDL-58064 lang: Clarify the PHP 7.x limitations
...
These are related to SQL*Server support only and affect all PHP 7
versions, not just 7.0.x. Credit goes to Eloy Lafuente for spotting
this.
2017-03-07 13:01:27 +01:00
9a2e5ad36c
Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle
2017-03-07 12:15:46 +01:00
Eloy Lafuente (stronk7)