Commit graph

83534 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
4e0cad1cbd Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle 2017-03-10 18:03:53 +00:00
Eloy Lafuente (stronk7)
d8a70ba35f Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle 2017-03-10 18:03:53 +00:00
Dan Poltawski
1523d53bdc Merge branch 'MDL-58035' of git://github.com/timhunt/moodle 2017-03-10 18:03:52 +00:00
Ankit Agarwal
58d85af209 MDL-56526 userlib: Do not allow not loggedin users if forceloginforprofile is set 2017-03-10 18:03:52 +00:00
Ankit Agarwal
6f5a433c95 MDL-56526 globalsearch: Fix bug in phpdocs 2017-03-10 18:03:51 +00:00
David Mudrák
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
Juan Leyva
1abfa3a95e MDL-58217 mod_feedback: Add data generators for items 2017-03-10 10:51:51 +01:00
Juan Leyva
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
Andrew Nicols
357712eabe MDL-55528 assignfeedback_editpdf: Remove unnecessary escapes 2017-03-10 10:45:47 +08:00
Andrew Nicols
3bd0d4397c MDL-55528 assignfeedback_editpdf: Add step to check all pages loaded 2017-03-10 10:45:46 +08:00
Andrew Nicols
f7a9f1dd0e MDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv 2017-03-10 10:45:46 +08:00
Andrew Nicols
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
Andrew Nicols
34df779a95 MDL-55528 core_files: Create new fileconverter plugintype 2017-03-10 09:31:14 +08:00
AMOS bot
2dfec31ef5 Automatically generated installer lang files 2017-03-10 00:04:10 +08:00
sam marshall
832a18a46a MDL-58177 tasks: Refactor scheduled task gui to use NO_OUTPUT_BUFFERING 2017-03-09 11:21:49 +00:00
Jun Pataleta
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
Davo Smith
c6dd683cd0 MDL-47354 gradereport_singleview: allow choice of 'perpage' values 2017-03-08 11:39:29 +00:00
Jun Pataleta
f113169573 MDL-55956 calendar: Include courses parameter in subquery conditions 2017-03-08 15:30:04 +08:00
Ryan Wyllie
373029ec33 MDL-57975 core: version bump
Part of MDL-55611
2017-03-08 03:33:24 +00:00
Ryan Wyllie
8fa8675de8 MDL-57975 core: add userdate mustache php helper
Part of MDL-55611
2017-03-08 03:33:24 +00:00
Ryan Wyllie
0e5b3e282f MDL-57975 javascript: add userdate mustache js helper
Part of MDL-55611
2017-03-08 03:33:24 +00:00
Ryan Wyllie
b61015cfcd MDL-57975 javascript: add user_date.js
Part of MDL-55611
2017-03-08 03:33:23 +00:00
Ryan Wyllie
9c7ffb80d3 MDL-57975 core: test for user date external function
Part of MDL-55611
2017-03-08 03:33:23 +00:00
Ryan Wyllie
88c2941b26 MDL-57975 core: add get user date external function
Part of MDL-55611
2017-03-08 03:33:23 +00:00
John Okely
c0f70d1a7a MDL-57751 libraries: Remove <2.6 only check from load_installed_plugins 2017-03-08 08:37:36 +08:00
Dan Poltawski
228637feff Merge branch 'MDL-57990-master' of git://github.com/crazyserver/moodle 2017-03-07 14:00:07 -03:00
AMOS bot
305ecff614 Automatically generated installer lang files 2017-03-08 00:05:35 +08:00
Eloy Lafuente (stronk7)
21521604af Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle 2017-03-07 16:36:54 +01:00
Dan Poltawski
6dba6a5a6a Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle 2017-03-07 11:12:32 -03:00
Dan Poltawski
7ebe17f38a Merge branch 'wip-mdl-58056' of https://github.com/rajeshtaneja/moodle 2017-03-07 11:08:24 -03:00
Dan Poltawski
58798ecb52 Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle 2017-03-07 11:07:47 -03:00
Tim Hunt
56068f5972 MDL-58035 tool_templatelibrary: fix unit test using removed base theme 2017-03-07 13:35:06 +00:00
Tim Hunt
ea049ee618 MDL-58035 lib: log when the expected theme cannot be initialised 2017-03-07 13:29:46 +00:00
David Monllao
58f7a83036 Merge branch 'MDL-58106' of git://github.com/timhunt/moodle 2017-03-07 13:37:24 +01:00
David Monllao
2aa1855205 Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle 2017-03-07 13:15:55 +01:00
David Monllao
68aab93ea5 Merge branch 'MDL-57280-master' of git://github.com/ryanwyllie/moodle 2017-03-07 13:13:51 +01:00
David Mudrák
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
David Monllao
9a2e5ad36c Merge branch 'wip-MDL-57485-master' of git://github.com/abgreeve/moodle 2017-03-07 12:15:46 +01:00
David Monllao
02c7f6e888 Merge branch 'MDL-58057-master' of https://github.com/snake/moodle 2017-03-07 12:09:00 +01:00
David Monllao
996731dded Merge branch 'MDL-45584_master' of git://github.com/markn86/moodle 2017-03-07 12:00:01 +01:00
Dan Poltawski
a7fc1af138 MDL-58040 blocks: add upgrade.txt note 2017-03-07 07:46:38 -03:00
Dan Poltawski
a3da85e42e Merge branch 'MDL-58040' of git://github.com/timhunt/moodle 2017-03-07 07:43:46 -03:00
Dan Poltawski
44c4f148da Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle 2017-03-07 07:02:33 -03:00
Dan Poltawski
473efd8d53 Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle 2017-03-07 06:54:37 -03:00
Dan Poltawski
d04310cb21 Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-07 06:47:38 -03:00
Ankit Agarwal
0884ddea86 MDL-57362 assign: Fix permission checks 2017-03-07 12:43:30 +05:30
Andrew Nicols
0c90bfe39b Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle 2017-03-07 14:35:00 +08:00
Ryan Wyllie
75378ded5f MDL-57972 mustache: add shortentext template helper
Part of MDL-55611
2017-03-07 06:33:56 +00:00
Ryan Wyllie
180f5f23a6 MDL-57972 javascript: add upgrade instructions for truncate.js
Part of MDL-55611
2017-03-07 06:33:56 +00:00
Ryan Wyllie
7172b33e24 MDL-57972 javascript: Change truncate.js behaviour
Updated truncate.js to behave closer to the moodle implementation of
shorten_text.

Part of MDL-55611
2017-03-07 05:22:38 +00:00