Commit graph

1674 commits

Author SHA1 Message Date
Damyon Wiese
d629c601c5 MDL-48634 grades: Add an option to rescale when changing the maxgrade 2016-02-05 18:20:17 +08:00
Juan Leyva
0bf6c0bebe MDL-52895 webservice: Fix capability checks 2016-02-03 10:57:07 +01:00
Juan Leyva
e3e036ee09 MDL-52974 mod_assign: New Web Service mod_assign_view_submission_status 2016-02-02 13:27:03 +01: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
Dan Poltawski
3bb9f374e7 Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle 2016-02-01 11:17:02 +00: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
Eloy Lafuente (stronk7)
94fe0fa02e Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle 2016-01-29 10:15:20 +08:00
Clement Smith
4956503b11 MDL-52566 mod/assign: Fix group submission draft records
When group assignments are submitted by the first student in a group,
the logic that saves the submission is not creating a draft
assignment record in mdl_assign_submission. This leads to problems
when other functions are used that depend on these records, such as
marking workflow. This fixes the issue and correctly creates
draft assignment submission records for the non-submitting students
in the group.
2016-01-25 10:06:45 -06:00
Rajesh Taneja
380ab95f20 MDL-52839 behat: Fixed xpath and wait to ensure element is visible 2016-01-21 15:50:44 +08: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
Greg Faller
3eb931d365 MDL-50083 mod_assign: unlock submission when adding attempt 2016-01-20 09:26:55 +10:30
Andrew Nicols
9dd33a288e Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle 2016-01-19 08:45:42 +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
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
Andrew Nicols
7b9b861b7b Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle 2016-01-12 09:31:06 +00:00
Dan Poltawski
37727364bb Merge branch 'MDL-52503_master' of git://github.com/dmonllao/moodle 2016-01-05 14:47:45 +00:00
Davo Smith
0d5a260ecd MDL-52290 assignfeedback_editpdf: show number of pages in page select 2016-01-05 10:01:45 +00:00
David Monllao
1a51661b94 MDL-52503 mod_assign: Removing session cache
Replaced with a global $SESSION var, deferring cleanup to session
destroy.
2016-01-05 15:04:32 +08:00
Helen Foster
8bd563e53f MDL-52645 lang: Merge English strings from the en_fix language pack 2016-01-04 11:48:33 +01:00
Michael Aherne
f6b4fe38a9 MDL-52439 assign: correct get_user_submission() phpdoc 2015-12-29 10:37:14 +00:00
Mark Nelson
c319e44954 MDL-52312 assignfeedback_editpdf: changes to files after FPDI update
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
3) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
2015-12-07 17:39:30 +08:00
Mark Nelson
f970013b16 MDL-52312 assignfeedback_editpdf: updated the FPDI libary to 1.6.1 2015-12-07 10:57:51 +08:00
Dan Poltawski
b7f54e5c79 Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle 2015-12-03 11:11:06 +01:00
Eloy Lafuente (stronk7)
71a2aaabd4 Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle 2015-11-30 23:52:45 +01:00
jinhofer
fbbb33a20e MDL-51706 mod/assign: Moved plagiarism links to top of online text 2015-11-27 11:13:56 -06:00
jinhofer
acf9e30086 MDL-51693 mod/assign: Added plagiarism links to full text 2015-11-27 11:13:47 -06:00
Michael Aherne
72797e6845 MDL-52013 assign: Allow subplugins to add calendar events 2015-11-26 14:28:53 +00:00
David Monllao
c506af7786 Merge branch 'MDL-44330' of git://github.com/NeillM/moodle 2015-11-24 17:03:06 +08:00
Neill Magill
3fca693751 MDL-44330 Assign: Assignment grading may not display expected student
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:

1) The user had the table ordered by a value that could be modified,
   for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
   between the user generating the table and clicking on a grade link.

If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.

This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
2015-11-24 08:42:00 +00:00
David Monllao
6f77b910ee Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:56:06 +08:00
David Monllao
6a82d5d04e Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle 2015-11-23 13:32:35 +08:00
Dan Poltawski
b58d059525 MDL-37834 assign: avoid newlines in status column of csv
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
2015-11-20 18:36:30 +00:00
David Monllao
c181efe978 MDL-42571 editpdf: Fix search comments
They are also hidden instead of destroyed.
2015-11-19 14:59:03 +08:00
David Monllao
402f4a1f53 MDL-42571 editpdf: Fix comments search and multiple views drawing 2015-11-19 12:29:20 +08:00
Pavel Sokolov
4dab33b586 MDL-43069 assign: prevent JS error on grading table
Previously submission comments failed to expand if you hid
the file submissions column.
2015-11-18 15:41:42 +00:00
Dan Poltawski
a49fca44e0 MDL-49490 assign: can't export to portfolio on non-submission 2015-11-18 09:10:20 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
David Monllao
09083ab0a8 Merge branch 'MDL-42571' of git://github.com/blaky/moodle
Conflicts:
	mod/assign/feedback/editpdf/version.php
2015-11-16 13:39:59 +08:00
Bence Laky
da91de7821 MDL-42571 assignfeedback_editpdf: Fixed second PDF view 2015-11-12 14:16:17 +00:00
Eloy Lafuente (stronk7)
9e9754b7aa Merge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle 2015-11-11 23:14:47 +01:00
Damyon Wiese
6c2cfe281f MDL-51515 assign: Fix typo setting url in nav tree.
Thanks to Nelson Moller and Tyler Bannister.
2015-11-11 11:14:03 -06:00
Eloy Lafuente (stronk7)
2a8709f6df Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle 2015-11-10 20:19:06 +01:00
Eloy Lafuente (stronk7)
d18a8d716c Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle 2015-11-10 19:28:41 +01:00
Dan Poltawski
6ae9762b37 Merge branch 'MDL-52059' of git://github.com/stronk7/moodle 2015-11-10 14:48:27 +00:00
Dan Poltawski
8e4c398b52 Merge branch 'MDL-51314-groupmembership' of https://github.com/dmitriim/moodle 2015-11-10 14:44:22 +00:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Dan Poltawski
f46aa6bc42 Merge branch 'MDL-51628-master' of git://github.com/damyon/moodle 2015-11-09 11:01:21 +00:00