1642 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
David Mudrák
82a8d0d21d MDL-57580 mod_assign: Fix the incorrect type of some input parameters
The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.
2017-01-05 17:39:36 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Dan Poltawski
ae2bf1626c Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle 2016-12-13 14:55:50 +00:00
Andrew Nicols
106c8026d1 Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle 2016-12-13 10:25:30 +08:00
Matt Davidson
6be2b79b9c MDL-56810 unoconv: task fails if user removed
If the user is removed from a course after a submission has been made,
the task will crash and never continue.  This removes submissions from
the cron task if the user isn't enrolled in the course.
2016-12-12 08:22:51 -05:00
Mark Nelson
3b5b35a326 MDL-57222 mod_assign: show validation message on visible element 2016-12-12 11:55:18 +08:00
Henning Bostelmann
5c4bd8f4e8 MDL-56566 mod_assign: ignore "doanything" in course overview
Do not count site admin "doanything" capability for determining
what should be shown in the course overview for assignments.
2016-12-08 19:53:37 +00:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
Andrew Nicols
afecb4dfd5 Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle 2016-12-06 14:34:06 +08:00
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy
44f460c32a MDL-56614 behat: rename step for navigating in the gradebook 2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Andrew Nicols
405666d371 Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle 2016-12-05 13:01:31 +08:00
David Monllao
f4aec377fc Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle 2016-11-30 13:56:08 +08:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
David Monllao
1e102ca3ca Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle 2016-11-29 13:41:55 +08:00
Rajesh Taneja
9eb8f6ec56
MDL-57168 behat: Don't press continue as it will go to Annotate PDF
This might cause random failures as the draft files are being accessed by other user
2016-11-29 10:53:02 +08:00
David Monllao
dc3e3c0831 Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle 2016-11-29 10:51:10 +08:00
Mark Nelson
4a8c6b4259 MDL-56682 mod_assign: ensure the variable is not null 2016-11-28 16:47:00 +08:00
Tony Butler
7962b4845c MDL-56346 assignfeedback_editpdf: Correct typo in property name 2016-11-25 11:09:33 +00:00
Dan Poltawski
ad76556b76 Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle 2016-11-24 15:58:05 +00:00
Marina Glancy
b0842f61f4 MDL-57019 behat: new step to navigate to gradebook section 2016-11-24 12:46:27 +08:00
Simey Lameze
b6f549d139 MDL-57097 mod_assign: add event listener to avoid form submit 2016-11-24 11:24:25 +08:00
Andrew Nicols
44cf94a877 Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle 2016-11-23 11:54:16 +08:00
Dan Poltawski
9446cb507c Merge branch 'MDL-56318-master' of git://github.com/damyon/moodle 2016-11-21 09:55:09 +00:00
Damyon Wiese
21a5c3c447 MDL-56318 assign: Polish for assign grading in boost
These styles mostly remove the responsiveness from the grading form.
2016-11-21 16:59:39 +08:00
Andrew Nicols
23bb1871b3 Merge branch 'MDL-55275' of https://github.com/tobiasreischmann/moodle 2016-11-21 11:01:40 +08:00
Marina Glancy
fc14932c40 MDL-57019 core_grades: change default navigation to tabs
without navigation block in boost it is not easy to navigation between gradebook sections
2016-11-21 09:31:49 +08:00
Shamim Rezaie
a6f29f4c63 MDL-52840 assignsubmission_file: Change default setting file size
The default value of the assignsubmission_file/maxbytes setting is changed to $CFG->maxbytes.
2016-11-21 04:38:05 +11:00
Tony Butler
40e0baf08e MDL-56948 mod_assign: Don't call get_grade_item() unless we have one 2016-11-18 15:37:09 +00:00
Andrew Nicols
3d15dfc9d2 Merge branch 'MDL-56221' of https://github.com/bostelm/moodle 2016-11-17 13:31:33 +08:00
Henning Bostelmann
9574320a36 MDL-56221 mod_assign: Suppress unwanted grade notifications
* Quick grading: Properly recognize unchanged grades
* Individual grading: Amend JS that transfers checkbox state
2016-11-16 21:53:33 +00:00
Tobias Reischmann
1cca9a3479 MDL-55275 assign: Prevent exception under admin role assignment.
In group mode the submission status was displayed to admins.
This caused an exception when the admins were enrolled as teachers
in a course while being the only member of a group.
2016-11-16 16:55:22 +01:00
Dan Poltawski
6027eaebc5 Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle 2016-11-15 16:33:26 +00:00
Dan Poltawski
efe57105d6 Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle 2016-11-15 10:42:36 +00:00
Helen Foster
7f6accd448 MDL-56903 lang: Merge English strings from the en_fix language pack 2016-11-15 11:19:48 +01:00
Simey Lameze
3745973281 MDL-55848 assignfeedback_editpdf: remove problematic class_exists check
Due to a bug on opcache, this check had to be removed along the empty class to avoid
error on assignment grading interface.
2016-11-15 09:05:42 +08:00
Dan Poltawski
8d857d0ecc Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle 2016-11-14 13:06:48 +00:00
Pau Ferrer Ocaña
0ffe8d2f0c MDL-56882 assign: Enable revert outcomes to No outcome 2016-11-14 09:56:35 +01:00
Adrian Greeve
f65db49765 MDL-56363 mod_assign: Restrictions added for tutors.
If the grader does not have the accessallgroups capability,
or groups mode is set to separate groups and the user is not
a member of the group then no participants are shown.
2016-11-11 00:28:33 +01:00
Andrew Nicols
3302e8bfa5 Merge branch 'MDL-56820-master' of https://github.com/snake/moodle 2016-11-10 12:20:17 +08:00
Jake Dallimore
700ef87691 MDL-56820 themes: Fix user search drop down on grading page for boost
Fixes a problem where the drop down list is cut off by overflow.
2016-11-10 11:45:59 +08:00
Simey Lameze
763f7b05ae MDL-56753 mod_assign: behat tests for groups and grouping counting 2016-11-10 11:09:37 +08:00
Simey Lameze
426bb5ae0f MDL-56753 mod_assign: fix groups and submitted counting on grading summary
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
2016-11-10 10:58:29 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Juan Leyva
6406431537 MDL-56839 upgrade.txt: Fix incorrect information in lib/upgrade.txt 2016-11-09 21:00:33 +00:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00