moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76730 commits 37 branches 540 tags 1.3 GiB
Commit graph

17404 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
94fe0fa02e Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle 2016-01-29 10:15:20 +08:00
Dan Poltawski
4ce6dac426 Merge branch 'MDL-52791' of git://github.com/timhunt/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
4ce63c9ccf Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle 2016-01-29 10:15:19 +08:00
David Monllao
99e96d83b6 Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle 2016-01-29 10:15:17 +08:00
David Monllao
33854a2968 MDL-52683 mod_scorm: Test for scorm_get_last_completed_attempt 2016-01-29 10:15:17 +08:00
David Monllao
0b8be05caf Merge branch 'MDL-52683-master' of git://github.com/s-cenni/moodle 2016-01-29 10:15:16 +08:00
Sara Cenni
ee8a2e2ed9 MDL-52683 mod_scorm: Fix for Last completed attempt error with Oracle 2016-01-22 10:16:05 +01:00
Andrew Nicols
61937f48f7 MDL-52682 mod_forum: Correct redirect URL when marking posts as read 2016-01-22 08:04:05 +08:00
Michael de Raadt
acc9fed2ee MDL-52835 mod_data: Correct MIME type for JS template 2016-01-22 09:51:08 +11:00
Rajesh Taneja
380ab95f20 MDL-52839 behat: Fixed xpath and wait to ensure element is visible 2016-01-21 15:50:44 +08:00
Tim Hunt
190fbfb60d MDL-52738 quiz: fix handling of showall by review prev link 2016-01-20 11:42:06 +00:00
Eloy Lafuente (stronk7)
5311e22963 MDL-50083 mod_assign: protect code against not set flags 
Yes could have used !empty() but for some reason found
the isset() && condition more clear. Tired brain, surely.
 2016-01-20 02:50:15 +01:00
Eloy Lafuente (stronk7)
0ddbf9b937 Merge branch 'master_MDL-50083' of https://github.com/greg-or/moodle-mod_assign 2016-01-20 01:31:52 +01:00
Eloy Lafuente (stronk7)
bb66ff5581 Merge branch 'master_MDL-42473' of git://github.com/danmarsden/moodle 2016-01-20 01:29:28 +01:00
Greg Faller
3eb931d365 MDL-50083 mod_assign: unlock submission when adding attempt 2016-01-20 09:26:55 +10:30
Dan Poltawski
b0be5f76ae Merge branch 'MDL-51123-master' of git://github.com/jleyva/moodle 2016-01-19 11:01:47 +00:00
Eloy Lafuente (stronk7)
cf003b48bc Merge branch 'MDL-46091' of git://github.com/timhunt/moodle 2016-01-19 07:32:09 +01:00
Andrew Nicols
77ee47bdb2 Merge branch 'MDL-48985_m31v1' of https://github.com/sbourget/moodle 2016-01-19 12:56:26 +08:00
Andrew Nicols
62d0d0b46d Merge branch 'MDL-52673-master' of https://github.com/pauln/moodle 2016-01-19 10:23:53 +08:00
Andrew Nicols
f3d23df572 Merge branch 'MDL-52784' of git://github.com/timhunt/moodle 2016-01-19 08:54:55 +08:00
Andrew Nicols
9dd33a288e Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle 2016-01-19 08:45:42 +08:00
Andrew Nicols
fe99a27859 Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle 2016-01-19 08:35:23 +08:00
Andrew Nicols
223c4add23 Merge branch 'MDL-50268-master' of git://github.com/lameze/moodle 2016-01-19 07:56:41 +08:00
Eloy Lafuente (stronk7)
b9103d358d Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle 2016-01-19 00:29:26 +01:00
Tim Hunt
1f0f413187 MDL-46091 quiz start attempt: rationalise confirmations. 
1. Don't show a warning if there are a limited number of attempts, only
   if there is a time limit.
2. Merge that time-limit warning into the same form that is used for
   entering a password, etc.
3. Make that form an JavaScript dialogue when you click the start attempt
   button.

AMOS BEGIN
  MOV ['confirmstarttimelimit', 'mod_quiz'], ['confirmstart', 'quizaccess_timelimit']
AMOS END
 2016-01-18 22:12:41 +00:00
Tim Hunt
fdd629667e MDL-52791 quiz editing: handle unknown question types 2016-01-18 17:35:50 +00:00
Dan Poltawski
0f97fc6c3f Merge branch 'MDL-52750' of git://github.com/timhunt/moodle 2016-01-18 15:50:11 +00:00
Dan Poltawski
5d5db1030f Merge branch 'MDL-52738' of git://github.com/timhunt/moodle 2016-01-18 14:47:45 +00:00
Simey Lameze
11d4bea28b MDL-50268 core: proper deprecation of get_file_url() method 2016-01-18 13:44:22 +08:00
David Monllao
50e954163d MDL-52269 mod_assign: Display info message if blind marking active 
Only for users with mod/assign:viewblinddetails capability, as other
users will quickly notice it.
 2016-01-18 12:15:34 +08:00
Andrew Nicols
159d801362 MDL-50915 mod_lesson: Remove js dependencies from behat tests 2016-01-18 10:46:32 +08:00
Andrew Nicols
d595468da5 Merge branch 'MDL-50915_m31v5' of https://github.com/sbourget/moodle 2016-01-18 10:18:31 +08:00
Tim Hunt
c67ab86fa9 MDL-52738 quiz: Previous button during attempt review. 
This is to be consistent with places like forum and book, where if we
have a next link, we also have a previous link.

At the same time I have amended the links/buttons from 'Previous'/'Next'
to 'Previous page'/'Next page' because I think that is clearer.

Also, on the last page of the quiz, I have changed 'Next' to 'Finish
attempt ...' for consistency with the link in the navigation block.

AMOS BEGIN
 CPY [navigatenext,mod_assignment],[navigatenext,mod_quiz]
 CPY [navigateprevious,mod_assignment],[navigateprevious,mod_quiz]
AMOS END
 2016-01-15 14:25:25 +00:00
Tim Hunt
a4100d4de3 MDL-52750 quiz reviewQ/comment: add page title & student name 2016-01-15 11:10:43 +00:00
Tim Hunt
a82f26e324 MDL-52784 quiz: unused param in quiz_get_combined_reviewoptions calls 2016-01-15 11:05:47 +00:00
Michael Hughes
59e9548762 MDL-52270 mod_assign: Adapt unit tests 2016-01-15 10:04:04 +08:00
Michael Hughes
18b797347f MDL-52270 Assignment: Display Participant Number 
Display participant number when user holds mod/assign:viewblinddetails capability.
 2016-01-15 09:43:16 +08:00
Dan Poltawski
dd3c2cf935 NOBUG: Fixed file access permissions 2016-01-14 10:09:55 +00:00
Dan Poltawski
7ea24d4925 NOBUG: Fixed SVG browser compatibility 2016-01-14 10:09:52 +00:00
Dan Marsden
ed383edb36 MDL-42473 mod_scorm: Enable FEATURE_GROUPS for mod_scorm 2016-01-14 17:24:26 +13:00
Andrew Nicols
a0418089d9 Merge branch 'MDL-372-int-master' of git://github.com/ryanwyllie/moodle 2016-01-13 10:22:24 +08:00
Andrew Nicols
75e7c855fc MDL-43620 mod_chat: Whitespace fix 2016-01-13 10:20:25 +08:00
Ryan Wyllie
f9621c56c4 MDL-372 forum: tests for pinned discussions 2016-01-13 02:01:27 +00:00
Ben Kelada
5f219cf181 MDL-372 forum: Improve pinning and update for Moodle 3.0 2016-01-13 02:01:26 +00:00
Charles Fulton
87b007b4dd MDL-372 forum: support for pinned discussion topics 2016-01-13 02:01:26 +00:00
Andrew Nicols
1b67113353 Merge branch 'MDL-43620_m31v2' of https://github.com/sbourget/moodle 2016-01-13 09:38:45 +08:00
Dan Poltawski
04a03ff282 Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle 2016-01-12 14:17:14 +00:00
Dan Poltawski
07f4e11100 Merge branch 'MDL-52315-master' of git://github.com/andrewnicols/moodle 2016-01-12 13:31:40 +00:00
Dan Poltawski
7931245f95 Merge branch 'wip-mdl-52656' of https://github.com/rajeshtaneja/moodle 2016-01-12 10:39:46 +00:00
Andrew Nicols
7b9b861b7b Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle 2016-01-12 09:31:06 +00:00