Commit graph

1635 commits

Author SHA1 Message Date
Dan Poltawski
970fcc44e6 MDL-54980 mod_assign: bump version 2016-07-04 14:10:24 +01:00
Dan Poltawski
351e06e424 Merge branch 'MDL-54980-master' of git://github.com/jleyva/moodle 2016-07-04 14:09:43 +01:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Dani Palou
5609da91fa MDL-55113 assign: Use PARAM_RAW in onlinetext text 2016-07-04 09:53:36 +02:00
Barbara Ramiro
40be0da500 MDL-54165 mod_assign: Layout icons for the new grading interface 2016-07-04 07:00:11 +00:00
Cameron Ball
c89d23ee6d
MDL-41945 mod_assign: Properly check if submission is empty
Previous empty submission checks required the submission to
be saved to the database. This patch adds a new method to
submission plugins that lets them report whether the submission
is empty before it is saved.
2016-07-04 10:55:06 +08:00
Cameron Ball
16b36d376a
MDL-41945 mod_assign: Check if submission has been modified
This patch adds a check that stops a user submitting an assignment
if someone else has modified it in the meantime.
2016-07-04 10:51:57 +08:00
Eloy Lafuente (stronk7)
4a365babb6 Merge branch 'MDL-54855-master' of git://github.com/crazyserver/moodle 2016-06-30 09:24:57 +01:00
Andrew Nicols
ea5241410d Merge branch 'MDL-54991-master' of git://github.com/crazyserver/moodle 2016-06-29 15:05:24 +08:00
Pau Ferrer Ocaña
ff6de75396 MDL-54991 assign: Invalid submissiongroup when not using groups 2016-06-27 09:24:29 +02:00
Pau Ferrer Ocaña
36f1d79ea2 MDL-54909 assign: Style editpdf background to differ from page bg 2016-06-23 15:06:59 +02:00
Pau Ferrer Ocaña
796161018c MDL-54855 assign: Add missing field in get_assignments 2016-06-23 15:05:17 +02:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Eloy Lafuente (stronk7)
e822312af3 Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle 2016-06-21 20:00:36 +02:00
Juan Leyva
23717c804d MDL-54980 mod_assign: Add WS list_participants to the Mobile service 2016-06-21 15:30:58 +01:00
Juan Leyva
d889b58747 MDL-54955 webservice: Apply external_format_string in course names 2016-06-20 13:16:52 +01:00
Rajesh Taneja
fba0ac63b8 MDL-54589 behat: Added hack for some OS/browsers 2016-06-20 16:03:36 +08:00
Rajesh Taneja
3aaf98f62c MDL-54589 behat: Trigger change event after selecting option
After selecting option, some browsers need
explicit change event
2016-06-20 09:43:08 +08:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
2016-06-17 09:03:18 +01:00
Dan Poltawski
4c62bdab0d MDL-54654 assignfeedback_editpdf: remove invalid CSS
The 'left' positioing was invalid and conflicting with the
right definition anyway, so wasn't necessary.
2016-06-16 20:52:04 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Eloy Lafuente (stronk7)
392c40467f Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:04 +01:00
Jun Pataleta
cdbdb2f9b7 MDL-54772 mod_assign: Fixes for PDF editor
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
2016-06-13 09:54:02 +08:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
2016-06-10 10:06:25 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10:00
Dan Poltawski
631edc10ae MDL-46721 assign: clarify ternerary statement 2016-06-07 12:15:19 +01:00
Dan Poltawski
db417025d7 Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle 2016-06-07 12:12:28 +01:00
Dan Poltawski
df4af29945 Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle 2016-06-07 09:41:27 +01:00
Dan Poltawski
e750544a06 Merge branch 'MDL-53392_master' of https://github.com/snake/moodle 2016-06-06 13:21:09 +01:00
Dan Poltawski
a7de32a265 Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle 2016-06-06 11:59:42 +01:00
Jun Pataleta
bb2281d53c MDL-54765 mod_assign: Use selectedIndex for setting page selection
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
2016-06-03 14:55:43 +08:00
Adrian Greeve
0cf8082a8f MDL-49852 mod_assign: Unit tests for activity completion. 2016-05-27 14:10:55 +08:00
Jake Dallimore
7eafbbf7fa MDL-53392 mod_assign: Remove old Grade Max warning string references 2016-05-26 17:16:53 +08:00
Steve Bader
9569b01cc9 MDL-49852 mod_assign: Fix group assignment completion tracking
Fixes completion tracking for group assignments where either only
one student is required to click Submit when submitting the
assignment for grading, all students are required to submit,
or no students are required to click submit (meaning that simply
uploading submits for grading).
2016-05-26 16:03:03 +08:00
Cameron Ball
4ca7fdd26e MDL-46721 assign: Make blind marking participant numbers match
Previously emails were setting the "From" header to the incorrect
participant number.
2016-05-24 18:19:54 +08:00
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