20055 Commits

Author SHA1 Message Date
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
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
Andrew Nicols
d7a6e531ee Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle 2018-03-19 09:01:19 +08:00
Tim Hunt
d9b80a5e69 MDL-61605 quiz report: add missing index/key
Thanks to Patryk Szuta for the suggestion
2018-03-18 20:40:43 +00:00
Luca Bösch
2ffd2afdba MDL-52989 mod_lesson: Fix cluster_jump returning a cluster page id. 2018-03-16 13:44:44 +01:00
Luca Bösch
ef2b45a977 MDL-58179 lesson: Avoid using span with class "label" 2018-03-16 08:52:21 +01:00
Dan Marsden
37ddc231f8 MDL-58080 mod_scorm: add immutable header for scorm content files. 2018-03-15 12:50:38 +13:00
Eloy Lafuente (stronk7)
4b183d2258 Merge branch 'MDL-61475-master-v3' of git://github.com/snake/moodle 2018-03-14 11:00:57 +01:00
Jake Dallimore
a57960ee11 MDL-61475 mod_choice: perf improvement when exporting personal data
Instead of creating an array containing all record information and then
writing, we know write periodically during the recordset iteration, thus
alleviating any memory concerns associated with the array approach.
2018-03-14 09:36:03 +08:00
Jake Dallimore
f1c1db434a MDL-61475 mod_choice: Update core_privacy implementation 2018-03-14 09:36:03 +08:00
Jun Pataleta
138816b1b1 MDL-61475 mod_choice: Add implementation of Privacy API 2018-03-14 09:36:03 +08:00
Andrew Nicols
1290576dab Merge branch 'MDL-61567-master' of git://github.com/zig-moodle/moodle 2018-03-13 12:15:21 +08:00
Zig Tan
e3644cd5c6 MDL-61567 mod_url: Implement null provider mod_url 2018-03-13 11:02:00 +08:00
Zig Tan
f318b80a0f MDL-61567 mod_resource: Implement null provider mod_resource 2018-03-13 11:02:00 +08:00
Zig Tan
121638b23f MDL-61567 mod_page: Implement null provider mod_page 2018-03-13 11:02:00 +08:00
Zig Tan
9da92dc1a9 MDL-61567 mod_label: Implement null provider mod_label 2018-03-13 11:02:00 +08:00
Zig Tan
c383366601 MDL-61567 mod_folder: Implement null provider mod_folder 2018-03-13 11:01:59 +08:00