Damyon Wiese
fc1dac2e1e
MDL-46044 Assign: Fix print_overview function when there are multiple attempts
2014-06-27 14:15:31 +08:00
Damyon Wiese
5533e011ce
MDL-46044 Assign: Update unit test to test multiple attempts on overview page
2014-06-27 14:15:31 +08:00
David Monllao
e20392edc0
MDL-42716 mod_assign: Lang str for the viewblinddetails capability
2014-06-25 13:20:41 +08:00
Jonathon Fowler
60a601dbe0
MDL-46080 assign: fix offline grading worksheet marker column
2014-06-25 12:18:26 +10:00
Eloy Lafuente (stronk7)
c45754d840
Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle
2014-06-24 21:54:58 +02:00
Eloy Lafuente (stronk7)
046930cfba
Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle
2014-06-24 21:48:30 +02:00
Marina Glancy
9cd5966168
Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle
2014-06-24 13:52:30 +08:00
Marina Glancy
bb9fd6b29d
Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle
2014-06-24 13:51:20 +08:00
Damyon Wiese
e70f8d0a30
MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages.
2014-06-24 13:42:53 +08:00
Marina Glancy
e28d6b29dc
MDL-42716 assign: whitespace fix
2014-06-24 13:04:49 +08:00
Michael Hughes
323f221b11
MDL-42716 Assign: Implemented capability based viewing of blind details (squashed)
2014-06-24 12:27:10 +08:00
Damyon Wiese
2dffa24f10
Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle
2014-06-23 15:17:45 +08:00
Frederic Massart
b4148e4688
MDL-45580 assignfeedback_editpdf: Save readonly version in backup
2014-06-23 14:46:18 +08:00
Frederic Massart
7dbbb848c6
MDL-45580 assignfeedback_editpdf: Delete draft content on new submission
2014-06-23 14:17:24 +08:00
Frederic Massart
098f7dd438
MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF
2014-06-23 14:16:49 +08:00
Damyon Wiese
a51201a433
Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle
2014-06-23 12:20:04 +08:00
Damyon Wiese
a084ac0db4
MDL-46045 Fix php tags (lowercase) everywhere
2014-06-19 11:05:16 +08:00
Damyon Wiese
1165b7ded7
MDL-45933 Assign: Prevent fatal error when there are no users in the grading table
2014-06-18 15:17:02 +08:00
Russell Smith
d2c58b95bb
MDL-43835 phpunit: Correct unit tests.
...
When different ID's are set for each sequence a number
of unit test failures appear. They have been corrected
to allow unit tests to pass with the new generator in place.
2014-06-17 19:08:01 +10:00
Damyon Wiese
e192e37f51
MDL-45582 EditPDF: whitespace fix
2014-06-17 10:27:19 +08:00
Damyon Wiese
177cc379ed
MDL-45582 Editpdf: Prevent debugging when there is no pdf
2014-06-17 10:21:14 +08:00
Damyon Wiese
fac23f93ec
Merge branch 'master_MDL-45582' of git://github.com/greg-or/moodle-mod_assign
2014-06-17 10:20:39 +08:00
Eloy Lafuente (stronk7)
8888451ed5
Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle
2014-06-17 00:51:26 +02:00
Marina Glancy
db8071a7f9
Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle
2014-06-16 17:28:15 +08:00
Gregory Faller
028c9d20b9
MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature
2014-06-16 18:09:21 +09:30
Damyon Wiese
a3d7a82b64
Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle
2014-06-16 16:26:06 +08:00
Damyon Wiese
de06ce7ed3
MDL-45940 Assign: Improved access check
...
Call can_edit() instead of repeating a (slightly wrong) access check.
2014-06-16 16:20:11 +08:00
Mark Nelson
3b0347712a
MDL-45445 events: added '(optional)' to event params where applicable
2014-06-12 20:46:58 -07:00
Mark Nelson
b448a5ac67
MDL-45445 events: trivial changes
2014-06-12 20:46:58 -07:00
Frederic Massart
13a13c1178
MDL-45870 mod_assign: Behat test covering some outcome usage
2014-06-11 10:33:57 +08:00
Damyon Wiese
850833378d
Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle
2014-06-10 14:01:23 +08:00
Jonathon Fowler
c462c35b95
MDL-42531 assign: refactor batch operations to use forms properly
...
Avoids a lot of ugly optional_param() use. Also fixes the
non-functional cancel buttons.
2014-06-10 14:06:41 +10:00
Damyon Wiese
5ba4ca894a
MDL-45729 assign: Fix for assign unit tests
...
Check the user in the params, not the $USER
2014-06-10 11:39:20 +08:00
Graham Bowman
09fdd221ca
MDL-45729 assign: conditional submission summary
...
Only show the submission summary if user has assign:submit capability.
Amended to fix some whitespace and the commit message.
2014-06-09 22:07:15 +02:00
Eric Merrill
98f52b7dc0
MDL-45761 assign Set inline comment format properly when plugin is empty
...
If a plugin says it is empty, skip it for for building the inline
comment.
If not format was found in any plugins, set to FORMAT_HTML, which is
the default for feedback anyways.
2014-06-05 08:56:24 -04:00
Frederic Massart
78f69e51fc
MDL-45870 mod_assign: Outcomes are saved for each group member
2014-06-05 15:56:13 +08:00
Marina Glancy
0313897108
Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/phpunit/bootstrap.php
2014-06-04 10:07:03 +08:00
Rajesh Taneja
1bce3a70d9
MDL-44839 admin: Moved all system executable paths to config
...
AMOS BEGIN
MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
2014-06-03 17:33:49 +08:00
Damyon Wiese
96c9b2feb3
Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle
2014-06-03 15:00:27 +08:00
Damyon Wiese
5d759c9563
Merge branch 'MDL-45677_master' of https://github.com/markn86/moodle
2014-06-03 14:37:55 +08:00
Gregory Faller
556483d47d
MDL-44098: Late submissions with extension calculate period of lateness incorrectly
2014-06-03 12:40:36 +08:00
Mark Nelson
1ea5f1e2d3
MDL-45630 events: removed unnecessary 'the' from event descriptions
2014-05-31 15:27:11 -07:00
Eloy Lafuente (stronk7)
f94891cc00
MDL-45503 upgrade: add v2.7.0 sep lines
2014-05-28 01:13:42 +02:00
Marina Glancy
87c1a30b1f
Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle
2014-05-26 14:40:56 +08:00
Damyon Wiese
4e2bf2381f
MDL-45661 Assign: Clean bad data from DB after MDL-42526
2014-05-26 12:36:21 +08:00
Marina Glancy
9e41209bba
Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle
2014-05-26 11:58:50 +08:00
Sam Hemelryk
1912b5aa92
Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle
2014-05-26 13:23:02 +12:00
Sam Hemelryk
c5eef789b9
Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle
2014-05-26 09:02:39 +12:00
Mark Nelson
f5928e7893
MDL-45677 mod_assign: removed treatment of an array as an object
2014-05-22 22:16:57 -07:00
James Pratt
fdb6811224
MDL-42526 mod_assignment : fix record insert with assigment.id 0
2014-05-22 12:10:07 +07:00