17443 Commits

Author SHA1 Message Date
David Monllao
098650d8e2 Merge branch 'MDL-52930-master' of git://github.com/andrewnicols/moodle 2016-02-09 18:06:10 +08:00
Dan Poltawski
37f77a1b37 Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle 2016-02-09 09:43:21 +00:00
Dan Poltawski
a4391b76ee Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle 2016-02-08 17:13:02 +00:00
Simey Lameze
2b10cf43d1 MDL-48778 mod_assign: behat tests for group submission 2016-02-08 12:58:41 +08:00
David Monllao
502648e3a6 Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle 2016-02-08 11:23:34 +08:00
Eric Merrill
002864cc37 MDL-48778 assign: Use proper latest attempt for quickgrading prechecks
The code that stored lastmodified in gradingtable used a different
method to produce it than the processor used to generate the check
value. Fix that and also check that the attempt number has not changed.
2016-02-08 10:34:24 +08:00
Andrew Nicols
0099960560 MDL-44087 mod_forum: Move forum digest to new processor 2016-02-08 07:54:14 +08:00
Andrew Nicols
d6ffb0277a MDL-52930 mod_forum: Add get_unmailed_posts tests 2016-02-05 14:33:17 +08:00
Josh Marshall
86a77c9195 MDL-52930 forum: Correct get_unmailed_posts logic 2016-02-05 14:33:17 +08:00
Juan Leyva
0bf6c0bebe MDL-52895 webservice: Fix capability checks 2016-02-03 10:57:07 +01:00
Andrew Hancox
279918e126 MDL-51306 mod_folder: Add button to download entire folder. 2016-02-02 15:07:48 +00:00
David Monllao
52ad3afadb Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle 2016-02-02 17:40:39 +08:00
Marina Glancy
e11d7380c2 MDL-51283 core_tag: change tagtype to isstandard
Change 'official' to 'standard' in UI
2016-02-02 17:31:14 +08:00
Rajesh Taneja
97eee5baac MDL-42395 mod_assign: Single feedback is always visible
Single feedback is always visible, so no need to click to expand
2016-02-02 16:06:45 +08:00
David Monllao
51f322023f Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle 2016-02-02 10:55:59 +08:00
Dan Poltawski
3bb9f374e7 Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle 2016-02-01 11:17:02 +00:00
Dan Poltawski
89881711da MDL-45740 choice: version bump 2016-02-01 11:09:42 +00:00
Dan Poltawski
98e01bb70e Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle 2016-02-01 11:02:22 +00:00
Mark Nelson
da82688689 MDL-45740 mod_choice: fixed remaining issues 2016-02-01 18:49:22 +08:00
David Monllao
6b7421003b Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle 2016-02-01 17:19:59 +08:00
Mark Nelson
635166b8c8 MDL-42395 mod_assign: build YUI module and fixed lint errors 2016-01-29 17:56:11 +08:00
Rushikesh
4f491bf70b MDL-42395 mod_assign: Showing the most recent feedback 2016-01-29 17:56:05 +08:00
Stephen Bourget
e62f6a01e4 MDL-45740 choice: add new events 2016-01-29 13:23:15 +08:00
Eloy Lafuente (stronk7)
fabe7ebd53 MDL-50620 mod_scorm: Preventive (on rewrite) version bump to current. 2016-01-29 10:15:28 +08:00
Eloy Lafuente (stronk7)
89bb268e21 MDL-37739 mod_wiki: test headings being wikilinks (toc and content) 2016-01-29 10:15:23 +08:00
Eloy Lafuente (stronk7)
7b6d50b743 Merge branch 'MDL-37739-malformed-wiki-toc-links' of https://github.com/lucaboesch/moodle 2016-01-29 10:15:23 +08:00
Dan Poltawski
e092a7c3d8 Merge branch 'MDL-48953_m31v4' of https://github.com/sbourget/moodle 2016-01-29 10:15:22 +08:00
David Monllao
5ceb208ba7 Merge branch 'MDL-42190-master-workshopdelsub' of git://github.com/mudrd8mz/moodle 2016-01-29 10:15:21 +08:00
David Monllao
25dbed8b9e Merge branch 'MDL-52459-master' of git://github.com/jleyva/moodle 2016-01-29 10:15:20 +08:00
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
Dani Palou
156de651c7 MDL-51704 survey: Fix display problems in report page 2016-01-26 14:06:57 +01:00
David Mudrák
66a3df7f55 MDL-42190 workshop: Add behat tests for the submissions removal feature 2016-01-25 16:10:59 +01:00
David Mudrák
58489e11f1 MDL-42190 workshop: Improve the confirmation of submission removal
I noticed we do not need to list the names of potentially affected
reviewers. If the user (teacher) has the capability to see other
assessments (which they do in 99%), the list of assessments is displayed
at the confirmation page anyway. If for some reason they do not have the
capability, we should not list the names.

The second fix is that the action buttons (such as Delete or Edit) are
not displayed on the removal confirmation page.

And finally, as the output->confirm() wraps the message with implicit
<p>, it is not valid to pass HTML with any block elements. So instead of
concatenating the two messages, we simply define a new string for this
situation.
2016-01-25 15:17:45 +01:00
David Mudrák
3fa22899b6 MDL-42190 workshop: Fix the coding style of the patch 2016-01-25 15:17:44 +01:00
Paul Nicholls
30c52da9be MDL-42190 workshop: Add "sumbission_deleted" event
Add (and trigger) an event for deletion of submissions, so that deletions
are logged.
2016-01-25 15:17:44 +01:00
Paul Nicholls
deabe48bc5 MDL-42190 workshop: Add the ability to delete submissions
A new capability is introduced to control this, granted to teacher/admin
roles by default: mod/workshop:deletesubmissions.  Additionally, students
can delete their own submissions if they are currently able to edit them.
2016-01-25 15:17:44 +01: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
fa544b236d MDL-52137 mod_forum: Move digest body to shared template 2016-01-22 10:09:32 +08: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