Commit Graph

20092 Commits

Author SHA1 Message Date
Jun Pataleta c3fd1e97ba Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle 2018-04-17 12:07:49 +08:00
Frédéric Massart 29b44cedfc MDL-61862 mod_feedback: Tweak query to support UNION on TEXT fields
Thanks Oracle.
2018-04-17 11:35:55 +08:00
Andrew Nicols 18e58659bb Merge branch 'MDL-61980-master' of git://github.com/mihailges/moodle 2018-04-17 11:34:25 +08:00
Andrew Nicols 9dabc4b966 Merge branch 'MDL-61918-master' of git://github.com/mihailges/moodle 2018-04-17 11:12:24 +08:00
Andrew Nicols f8ad868fad Merge branch 'm35_MDL-60923_New_BackupDir_Setting-v2' of https://github.com/scara/moodle 2018-04-17 09:44:44 +08:00
Matteo Scaramuccia ef844148a9 MDL-60923 backup: Added $CFG->backuptempdir
The new setting will allow to host the temporary backup files
into a specific target directory. Defaults to '$CFG->tempdir/backup'.

Calling make_backup_temp_directory() checks that the required sub-directory
will be properly created under the new target directory.
2018-04-16 23:50:28 +02:00
Jun Pataleta d51c946700 Merge branch 'MDL-61862-master' of git://github.com/FMCorz/moodle 2018-04-16 23:30:42 +08:00
Frédéric Massart 9f6296e5de MDL-61862 mod_feedback: Implement core_privacy API 2018-04-16 18:45:27 +08:00
Jun Pataleta 1e09c9ac8f Merge branch 'MDL-61708-lti-fullnamedisplay' of https://github.com/wjroes/moodle 2018-04-16 15:29:08 +08:00
Mihail Geshoski c8cc46f851 MDL-61918 assignment: Implement null privacy provider
Implement null privacy provider to offline, online, upload and uploadsingle assignment plugins.
2018-04-16 09:59:46 +08:00
Mihail Geshoski 23a52d1a40 MDL-61980 booktool: Implement null privacy provider
Implement null privacy provider into booktool_exportimscp, booktool_importhtml, booktool_print plugin.
2018-04-13 16:15:30 +08:00
Eloy Lafuente (stronk7) 2d42e6e12c Merge branch 'MDL-61743_master' of git://github.com/dmonllao/moodle 2018-04-11 19:23:01 +02:00
David Monllao 0ca25fe2a9 Merge branch 'MDL-61581-master' of https://github.com/lucaboesch/moodle 2018-04-11 18:07:09 +02:00
Jake Dallimore 4af7042e6e Merge branch 'MDL-59691-master' of https://github.com/lucisgit/moodle 2018-04-11 16:01:03 +08:00
Eloy Lafuente (stronk7) bbe8bb0d02 Merge branch 'MDL-61709-scorm-student-fullnamedisplay' of https://github.com/wjroes/moodle 2018-04-11 01:49:54 +02:00
Eloy Lafuente (stronk7) bd0391d284 Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle 2018-04-10 15:53:37 +02:00
Dan Marsden fbfd69a865 MDL-32585 mod_scorm: Improve force new attempts setting.
AMOS BEGIN
 MOV [forcenewattempt,mod_scorm],[forcenewattempts,mod_scorm]
AMOS END
2018-04-10 13:38:51 +02:00
David Monllao fd91aab1e7 Merge branch 'MDL-61129-fix-accessibility-on-tables-mod_survey_MASTER' of https://github.com/guillalva06/moodle 2018-04-10 07:57:47 +02:00
Daniel Thies e909bfc70f MDL-61476 mod_glossary: Check XML arrays exist 2018-04-09 23:27:27 +02:00
Daniel Thies 26c9798596 MDL-61476 mod_glossary: Support tags in entries export 2018-04-09 23:26:34 +02:00
Tony Butler 60e9f9083e MDL-59691 assignfeedback_editpdf: Allow comment placement to all edges
Plus a couple of extra usability improvements:
- Collapse comment during move to allow precise placement
- Change cursor style to indicate that dragging is possible
2018-04-09 16:55:36 +01:00
Tony Butler ad7c719de4 MDL-59691 assignfeedback_editpdf: Allow comments to collapse to top-left
Forcing them to collapse to the bottom-left corner seems less natural
and effectively changes the location of existing comments from pre-3.3
2018-04-09 16:55:36 +01:00
Guillermo Alvarez f1dd1cb5e0 MDL-61129 survey: Add colgroup attribute at survey question tables 2018-04-09 10:33:43 -05:00
Andrew Nicols 98645b5be4 Merge branch 'MDL-60416_master' of git://github.com/markn86/moodle 2018-04-09 13:38:56 +08:00
Mark Nelson 9e0501a611 MDL-60416 ltiservice_gradebookservices: supply error code reason 2018-04-09 12:08:35 +08:00
Mark Nelson ede461a9a4 MDL-60416 ltiservice_gradebookservices: use moodle_url for links 2018-04-09 12:08:35 +08:00
Mark Nelson 43a60f7fd8 MDL-60416 ltiservice_memberships: construct JSON as PHP array 2018-04-09 12:08:35 +08:00
Mark Nelson 7a08156eef MDL-60416 mod_lti: add unit test for gradebook cleanup task 2018-04-09 12:08:35 +08:00
Claude Vervoort c02324d96a MDL-60416 mod_lti: Introduced LTI Advantage
A huge thanks goes to 'Diego del Blanco' and
'Chris Lawson' for contributing much of their
code and time to this project, and to Cengage
for sponsoring it.

Much appreciated!
2018-04-09 12:08:35 +08:00
Helen Foster efefa2d905 MDL-61033 mod_quiz: Update lang string 2018-04-09 10:39:19 +08:00
Andrew Nicols c36eea3d28 Merge branch 'MDL-61033-master' of https://github.com/nashtechdev01/moodle 2018-04-09 10:37:23 +08:00
willem 9376f7d68e MDL-61709 mod_scorm: use student fullname when not in standards mode
Changed the scorm12standard setting for SCORM 1.2 in a more generic
'use SCORM Standards' setting. New setting is off by default.

The student name passed into the module is formatted as
$USER->lastname .', '. $USER->firstname and thus ignores the
fullnamedisplay. This is per SCORM1.2 standards. If setting
'use SCORM Standards' is disabled fullname will be used instead.
2018-04-07 09:14:22 +02:00
Luca Bösch 3d7f501293 MDL-61581 lesson: style continue to last buttons 2018-04-06 16:44:12 +02:00
David Monllao 3650af761a MDL-61743 core_privacy: Add context level checks for all users deletion 2018-04-06 08:57:24 +02:00
Jake Dallimore 90cdf50dd9 Merge branch 'wip-MDL-61163-master' of git://github.com/marinaglancy/moodle 2018-04-05 10:36:57 +08:00
Andrew Nicols 8f205734fb Merge branch 'MDL-60726-master' of git://github.com/zig-moodle/moodle 2018-04-05 08:32:21 +08:00
Zig Tan 5687cd044d MDL-60726 assign: Fix assign submission confirmation alignment 2018-04-04 16:35:15 +08:00
Eloy Lafuente (stronk7) 5deadc8229 Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle 2018-04-04 00:45:37 +02:00
Eloy Lafuente (stronk7) 5b123ab8d3 Merge branch 'MDL-61724-master' of git://github.com/mihailges/moodle 2018-04-03 23:38:59 +02:00
Eloy Lafuente (stronk7) 1619d36e99 Merge branch 'MDL-60115-Book-cancel-button-redirect-bug-master' of https://github.com/Moodlers/moodle-1 2018-04-03 21:45:49 +02:00
Michael Brown 37fdff573b MDL-60115 mod_book: Book Resource Cancel Button Redirect Bug
When the user creates a book but adds no chapters, hitting cancel on
 the chapter creation page would redirect you right back to the same
 page with no explanation. This solution redirects to the course page
 when canceling chapter creation when no chapters are present.
2018-04-02 04:01:34 +00:00
Andrew Nicols 1690a76e62 Merge branch 'MDL-61574-master' of git://github.com/tallthom/moodle 2018-04-01 11:49:17 +08:00
Thom Rawson 6fb64a4ec0 MDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace 2018-04-01 12:39:54 +09:00
Marina Glancy c8d5e54cd1 MDL-61163 mod_wiki: guests should be able to view frontpage modules
When wiki is added to the frontpage and the guest role has capability to view
wiki, users should not be required to log in.
2018-03-29 11:11:48 +08:00
Marina Glancy c6956595f7 MDL-61163 mod_wiki: add default view capability to frontpage
It is inconsistent that guests are allowed to view frontpage wiki but once user is logged in they
loose this capability
2018-03-29 11:11:48 +08:00
Marina Glancy 3a93df8b9a MDL-61163 mod_wiki: correct capability check in modinfo
Wiki defines capability mod/wiki:viewpage instead of standard mod/wiki:view . This means that people
who do not have capability to view wiki still see it in the modules list.

Also corrected unittest that was testing situation when student has capability to create pages
but does not have capability to view pages. Such student should not see wiki module at all.
2018-03-29 11:11:45 +08:00
Andrew Nicols bddf012b7c Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle 2018-03-28 18:16:37 +02:00
Eloy Lafuente (stronk7) 67eb557286 Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle 2018-03-28 18:16:19 +02:00
Eloy Lafuente (stronk7) a8336b03a0 Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle 2018-03-28 18:12:48 +02:00
Andrew Nicols 0b4e4ca48f Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle 2018-03-28 18:12:36 +02:00