1399 Commits

Author SHA1 Message Date
David Monllao
ec7ade95db Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle 2016-05-23 14:23:57 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Jun Pataleta
7af009633a MDL-54661 mod_assign: Unescape course name in grading nav template 2016-05-20 15:28:37 +08:00
David Monllao
ee5c60c53a Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle 2016-05-20 13:53:26 +08:00
Jun Pataleta
920d3a95a1 MDL-54623 mod_assign: Fix for unit test
Fix mod_assign_external_testcase::test_list_participants_returns_user_property_types()
to avoid using hardcoded user properties.
2016-05-20 12:38:29 +08:00
David Monllao
2be707cb5e Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle 2016-05-20 10:36:07 +08:00
Jun Pataleta
5684c89b93 MDL-54623 mod_assign: Fetch correct types for user properties
Utilising core_user_external::user_description() to fetch the correct
types for the user properties.
2016-05-20 10:30:29 +08:00
Jun Pataleta
7150323ecd MDL-54623 mod_assign: Unit test for list_participants() 2016-05-19 15:36:44 +08:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
David Monllao
923b230c8e Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle 2016-05-18 16:20:27 +08:00
Adrian Greeve
759f61fe1c MDL-54061 mod_assign: Added encoding and separator to upload form.
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
2016-05-18 15:50:33 +08:00
David Monllao
d9e7af1d6a Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle 2016-05-18 14:02:00 +08:00
Ryan Wyllie
7d7e5a4cf0 MDL-54594 mod_assign: Fix editpdf toolbar breakpoints
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
2016-05-18 05:53:44 +00:00
David Monllao
98c3f736bb Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle 2016-05-18 11:30:25 +08:00
Adrian Greeve
897444d761 MDL-53923 mod_assign: Put messages into notifications.
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
2016-05-17 17:16:13 +08:00
Dan Poltawski
5a2283cdc0 Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:08 +08:00
Jun Pataleta
2664105c87 MDL-54595 mod_assign: Remove btn-group class 2016-05-17 11:53:10 +08:00
Adrian Greeve
0eecf87687 MDL-53923 mod_assign: Movement of functions to file_storage. 2016-05-16 14:32:54 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
Andrew Nicols
98c2893cdd Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle 2016-05-16 13:06:05 +08:00
David Monllao
c827acae2d MDL-53221 search: Renaming search areas
AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
2016-05-16 13:02:02 +08:00
Rajesh Taneja
528278f78f MDL-54588 behat: Button has been replaced with link
Adding a scale has been modified to use link
on outcome page
2016-05-16 09:13:29 +08:00
David Monllao
60152a2828 NOBUG: Fixed SVG browser compatibility 2016-05-13 18:33:22 +08:00
Barbara Ramiro
378733a4c3 MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature 2016-05-13 18:11:28 +08:00
David Monllao
8ae171ed1c Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle 2016-05-13 18:11:27 +08:00
Damyon Wiese
ab4d78ea82 MDL-53822 editpdf: Show different cursors for select and move 2016-05-11 14:54:38 +08:00
Cameron Ball
5e84acc2f3 MDL-53916 mod_assign: Point update grade link to new interface 2016-05-10 15:42:05 +01:00
David Monllao
677e6345c2 Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:41:15 +08:00
Andrew Nicols
0301e11bae Merge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:15 +08:00
Ryan Wyllie
1b2f9dc60c MDL-53821 mod_assign: Hide full name when blind marking
Hide the student's full name in the new grading intferface when blind
marking is on.
2016-05-10 02:07:02 +00:00
Ryan Wyllie
e6858c084a MDL-52506 mod_assign: Fix return links for atto auto save 2016-05-10 01:22:48 +00:00
Damyon Wiese
55907a738a MDL-53822 editpdf: Add a new tool for scrolling
I added a new tool to the toolbar to allow click and drag scrolling (especially useful for touchscreens).
2016-05-06 16:33:31 +08:00
Ryan Wyllie
a6c1a1c753 MDL-52133 mod_assign: Support userid on single grade page 2016-05-06 07:18:44 +00:00
Adam Olley
11ee4f71a4 MDL-54007 mod_assign: Limit unit tests to core plugins
Without this change, the unit tests make assumptions for the output of
mod_assign functions/webservices that do not hold true when 3rd party
submission and feedback plugins are installed.
2016-05-06 09:27:31 +08:00
Ryan Wyllie
d72fd8e28a MDL-53810 assign: Scroll for large rubrics on grading interface 2016-05-06 09:27:28 +08:00
Rajesh Taneja
8ade0df755 MDL-53601 behat: Fixed wrong behat steps 2016-05-03 17:26:31 +08:00
David Monllao
ff36ef7100 Merge branch 'MDL-51142-master' of git://github.com/damyon/moodle 2016-05-03 09:57:40 +08:00
Damyon Wiese
c78e567c5a MDL-51142 assign: Fix for group assignments with NEW status 2016-05-02 16:41:10 +08:00
Clement Smith
232b26f021 MDL-51142 mod/assign: Fix erroneous submission status display
This prevents display of submission time/date when the assignment
submission record is in a new state. It also keeps the display of
overdue assignments identical for those students who have viewed
the assignment yet not submitted, for those students who have
not viewed the assignment, and for those students who have not
viewed the assignment yet the instructor has accessed the grading
page.
2016-05-02 16:36:39 +08:00
David Monllao
71c0a5745c Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle 2016-05-02 16:17:48 +08:00
Adrian Greeve
1beb95af48 MDL-53601 mod_assign: Behat test for group feedback. 2016-05-02 15:54:53 +08:00
Adrian Greeve
181c20bc52 MDL-53601 mod_assign: Feedback files are sent to all group members. 2016-05-02 15:54:53 +08:00
Skylar Kelty
f66f7b89ec MDL-53836 mod_assign: Don't escape theme's larrow/rarrow 2016-05-02 02:55:27 +00:00
Dan Poltawski
ffce908869 Merge branch 'MDL-53780' of https://github.com/bostelm/moodle 2016-04-26 15:37:36 +01:00
Dan Poltawski
55905d6313 Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle 2016-04-25 22:01:38 +01:00
Simey Lameze
48da3eef6e MDL-52490 mod_assign: fix lang strings to make it consistent 2016-04-22 10:25:07 +08:00
Dan Poltawski
795adc89af Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle 2016-04-20 12:38:15 +01:00
David Monllao
c16c7530b1 Merge branch 'MDL-52596-assign-maxperpage' of https://github.com/brendanheywood/moodle 2016-04-20 11:04:10 +08:00
Mark Nelson
fcc9218fb8 MDL-53811 mod_assign: fixed error in convert submissions task 2016-04-19 13:08:27 +08:00
Brendan Heywood
80989850b6 MDL-52596 assign: Add max assignment per grading page site wide setting 2016-04-18 16:34:40 +10:00