20071 Commits

Author SHA1 Message Date
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
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
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
Simey Lameze
13e2b19838 MDL-61364 core: remove param from question_has_capability_on calls 2018-03-28 08:53:41 +08:00
dinhloc
f4695ec722 MDL-61033 quiz: Editing a quiz while a preview is open
Editing a quiz while a preview is open in another browser tab can leads to a cryptic error that is hard to recover from
2018-03-27 10:47:32 +07:00
Mihail Geshoski
d609207c3e MDL-61724 resource: Unable to view or download file resource 2018-03-26 11:14:46 +08:00
Mark Nelson
376a79c242 MDL-36941 core: added events for notifications 2018-03-23 12:30:27 +08:00
Luca Bösch
efdf25636a MDL-60119 mod_feedback: Suppress choice weight in parentheses. 2018-03-22 23:52:36 +01:00
cescobedo
adbf7c5a43 MDL-61576 mod_lti: remove allowinstructorcustom in lib/locallib.php 2018-03-22 09:59:30 +01:00
Jake Dallimore
a44987a081 Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle 2018-03-22 12:05:29 +08:00
Andrew Nicols
195480e9d7 MDL-58179 mod_lesson: Add missing : in labels 2018-03-22 11:59:52 +08:00
Andrew Nicols
532ecef010 Merge branch 'MDL-61530-master' of git://github.com/andrewnicols/moodle 2018-03-22 11:49:09 +08:00
Renaat Debleu
e44e67d725 MDL-61530 mod_glossary: import_entries.feature needs @_file_upload tag 2018-03-22 11:44:36 +08:00
Jun Pataleta
a9d98d5029 Merge branch 'MDL-52989-master' of git://github.com/junpataleta/moodle 2018-03-22 11:29:56 +08:00
Jun Pataleta
9ce10f2f2f MDL-52989 mod_lesson: Fix typo in feature description 2018-03-22 11:27:24 +08:00
Jun Pataleta
edf88a3bb3 Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle 2018-03-22 10:52:53 +08:00
Shamim Rezaie
3b5ae9777d MDL-61514 Quiz: Fix restore error
Include mod/quiz/locallib.php to fix the restore error.
2018-03-22 09:57:35 +11:00
Eloy Lafuente (stronk7)
bb0ca2c4a3 Merge branch 'MDL-61605' of https://github.com/timhunt/moodle 2018-03-21 00:24:46 +01:00
Juan Leyva
bc694b4761 MDL-61321 mod_feedback: Return all the items responses
The WS should receive all the item responses for all the attempts.
2018-03-20 10:36:11 +01:00
Andrew Nicols
2624bb10e2 Merge branch 'master_MDL-58080' of https://github.com/danmarsden/moodle 2018-03-20 14:08:16 +08:00
Andrew Nicols
f78a8a52a5 Merge branch 'MDL-58179-master' of https://github.com/lucaboesch/moodle 2018-03-20 13:38:59 +08:00
Luca Bösch
d6076942e3 MDL-58179 lesson: Avoid using span with class "label" 2018-03-19 21:13:11 +01:00
Andrew Nicols
89b8efb09b Merge branch 'MDL-58179-master' of https://github.com/lucaboesch/moodle 2018-03-19 10:22:14 +08:00