Commit graph

219 commits

Author SHA1 Message Date
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
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08: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
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
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Frederic Massart
abf3a51e29 MDL-45257 mod_assign: Removing wonky feedback_updated event 2014-04-28 15:13:55 +08:00
Frederic Massart
5730debbb9 MDL-45194 assign_feedback: Cache was never set and used in is_enabled 2014-04-22 15:32:25 +08:00
Andrew Nicols
8ae76e1388 MDL-45119 editpdf: Do not load quick comments in read-only mode 2014-04-17 11:43:51 +08:00
Petr Škoda
4781ff2e5f MDL-41101 use snapshots for submissions and grades in assign events 2014-04-17 09:59:09 +08:00
Mark Nelson
b7656ff069 MDL-41101 mod_assign: replaced 'save grading feedback' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Mark Nelson
9147c4e07f MDL-41101 mod_assign: replaced 'grade submission' add_to_log call with an event 2014-04-17 09:51:11 +08:00
Damyon Wiese
c70de965aa MDL-44583 Assign: performance fixes 2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847 Merge branch 'MDL-44822' of git://github.com/aolley/moodle 2014-03-31 12:46:21 +08:00
Adam Olley
9f7674bddc MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
2014-03-27 10:16:53 +10:30
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
ef3bffdec4 MDL-42025 behat: changed behat tag _only_local to _file_upload 2014-03-19 21:22:24 +01:00
Marina Glancy
7019e15e60 MDL-42025 behat: renamed deprecated method 2014-03-18 17:15:36 +08:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
Sam Hemelryk
2ef8ff9e05 MDL-44315 phpdoc: fixed up typos and made up tags 2014-02-24 09:13:31 +13:00
Andrew Nicols
aebc768f94 MDL-44079 Javascript: EditPDF editor should be modal 2014-02-11 12:18:52 +08:00
Marina Glancy
3ef6324aaa Merge branch 'MDL-43805-master' of git://github.com/damyon/moodle 2014-02-03 16:09:09 +08:00
Damyon Wiese
a6fd2e2cf1 MDL-43805 Assign: Quickgrading wipes out grades for hidden columns.
Grr.. quickgrading will always be a hack.
2014-01-29 20:29:35 +08:00
Damyon Wiese
ac2b4ffc8c MDL-43593 Assign editpdf: More robust handling of errors from TCPDF.
This includes a check to see if there are 0 pages in the combined pdf,
catching exceptions and suppressing php warnings and errors from bad pdf files.

Also - Use TCPDF directly to check if pdfs are compatible. The previous check was
letting dodgy PDFs through which then failed at generation time. This way dodgy
pdfs will get run through ghostscript early and cleaned up.
2014-01-24 16:16:38 +08:00
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Frederic Massart
2a5794e099 MDL-42995 mod_assign: Use new global function to strip content 2014-01-06 09:29:25 +01:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code
Zlib extension is now required.
2013-12-27 11:06:18 +08:00
Damyon Wiese
76dc48cb6a MDL-34432 Assign: Set up the commentinline form element properly. 2013-12-19 09:40:14 +08:00
Eloy Lafuente (stronk7)
1f71f7685a Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle 2013-12-17 22:58:51 +01:00
Sam Hemelryk
9b4c44c8e6 Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle 2013-12-18 09:59:05 +13:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/upgrade.txt
2013-12-17 16:32:35 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Andrew Nicols
5947ab3333 MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues 2013-12-11 16:56:49 +08:00
Marina Glancy
939aedfe30 Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle 2013-12-11 12:46:14 +11:00
Damyon Wiese
4fe9950ba6 MDL-43025 EditPDF: Increase memory limit when reading source pdfs. 2013-12-09 12:58:40 +08:00
Damyon Wiese
1f738c8c0c MDL-43074 assignfeedback_editpdf: Use escapeshellarg for all args in exec command.
This is to fix a reported problem with windows compatibility (e.g. when ghostscript is installed in
a folder with spaces in the name).
2013-12-09 10:52:35 +08:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Ruslan Kabalin
749700e4a7 MDL-43071 assign: Fix offline grades import for scale grading. 2013-11-26 16:36:37 +00:00
Damyon Wiese
3a5c3b3cbf MDL-42919 Assign: Remove no-label form hacks 2013-11-26 13:30:36 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Eloy Lafuente (stronk7)
474719d327 Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle 2013-11-13 23:09:09 +01:00
Damyon Wiese
60f0cd6bcd MDL-42866 EditPDF: Fix bad foreign key in install.xml
Thanks Tim for reporting this!
2013-11-13 21:46:44 +08:00
Damyon Wiese
b22292ed50 Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle 2013-11-13 14:42:32 +08:00
Marina Glancy
1d2a7ef54f Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-11-13 15:43:44 +11:00
Rajesh Taneja
baf881b803 MDL-42799 Assignment: Min. width/height for widget is set to 1
It was possible for user to add widgets with width/height = 0
which were not displayed to user and doesn't have much meaning to it
This patch will set min. width/height to 1
2013-11-12 16:17:40 +08:00
Jerome Mouneyrac
bb2f7c3ce9 MDL-42705 EditPDF: Progress bar styles in editpdf need to be moved to base theme. 2013-11-12 15:09:19 +08:00
Marina Glancy
b180048946 Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-11-11 15:02:48 +11:00
Marina Glancy
f1be232f68 Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle 2013-11-11 15:02:01 +11:00