Commit graph

784 commits

Author SHA1 Message Date
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Marina Glancy
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11:00
Dan Poltawski
f57053fc2a Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle 2013-10-09 17:23:44 +08:00
Rajesh Taneja
9dbe0313ce MDL-42222 Assignment: Added type check before checking mimetype
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
2013-10-09 16:53:46 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-09 15:58:45 +13:00
Paul Nicholls
0d64c75fb2 MDL-37153 - assign: Obey grade display settings in submission status
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
2013-10-09 15:56:52 +13:00
Dan Poltawski
fa96fb0cea Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle 2013-10-08 13:33:25 +08:00
Dan Poltawski
8431c290fd Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle 2013-10-08 13:25:12 +08:00
Dan Poltawski
6cd7df4df1 Merge branch 'MDL-38655' of git://github.com/aolley/moodle 2013-10-08 13:21:30 +08:00
Damyon Wiese
944cfe1dec Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle 2013-10-08 12:45:43 +08:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00
Jerome Mouneyrac
673c4ffe60 MDL-42030 EditPDF: when selecting stamp image the stamp tool is not selected 2013-10-07 12:13:08 +08:00
Marina Glancy
2a68ee0eb1 MDL-42016 files: Properly synchronise internal references 2013-10-06 18:05:05 +11:00
Damyon Wiese
1d45b0e469 MDL-42131 editpdf: Add missing require_login() to entry pages
Also:
* change require_once(config) to require(config)
* always define AJAX_SCRIPT
* Add full crumb trail to navbar for testgs.php
2013-10-04 15:20:34 +08:00
Damyon Wiese
c921825977 MDL-42150 Edit PDF: Fix error on saving annotations + comments.
Everything is an instanceof stdClass - need to reverse the logic.
2013-10-04 15:15:58 +08:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
9b70e68445 NOBUG: Fixed SVG browser compatibility 2013-10-04 15:43:53 +13:00
Dan Poltawski
6cebf2bd60 MDL-42143 editpdf: Convert gspath to proper setting
This will ensure we get better validation/feedback of the path.
2013-10-04 10:14:18 +08:00
Adam Olley
c447c03538 MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads 2013-10-04 09:27:32 +09:30
Damyon Wiese
9f5193a4b8 MDL-42023 Assign: Edit PDF plugin - fix unit tests 2013-10-03 14:05:28 +08:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Barbara Ramiro
95dfde5549 MDL-42023 assign: Edit PDF plugin - Barbara's contributions 2013-10-03 09:29:54 +08:00
Jerome Mouneyrac
e0cc92c650 MDL-42023 assign: Edit PDF plugin - Jerome's contributions 2013-10-03 09:29:54 +08:00
Davo Smith
1ce2ce7cb0 MDL-42023 assign: Add Edit PDF plugin to core.
This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.

A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.

The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.

This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.
2013-10-03 09:29:54 +08:00
Ankit Agarwal
5c7ec9f6f8 MDL-40962 assign: Fix alternate name field warnings in assign 2013-10-01 15:32:52 +08:00
Paul Charsley
e8b443df33 MDL-41738 added web service function mod_assign_set_user_flags 2013-09-30 08:20:52 +13:00
Sam Hemelryk
82b2bb5eca Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle 2013-09-17 08:50:38 +12:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Damyon Wiese
91327d96ca MDL-37148 assign: Fix missing parameter for submit_for_grading webservice.
It is required to specify if the user has accepted the submission statement
to make sure it goes in the log/event.
2013-09-16 09:34:32 +08:00
Damyon Wiese
20b7dcfc2c MDL-41315 assign: Add unit test for groupmembersonly 2013-09-13 16:43:26 +08:00
Damyon Wiese
a0e59f04dd MDL-41315 assign: Dont show users not in the current grouping
This is for separate groups mode. Note - this will be slower - but
this feature is experimental and groupslib does not provide a nicer api.
2013-09-13 14:47:01 +08:00
Damyon Wiese
1561a37cab MDL-37148 assign: Fix all phpdocs warnings from moodlecheck (except tests) 2013-09-13 13:30:02 +08:00
Damyon Wiese
539af60201 MDL-37148 assign: codechecker cleanups 2013-09-13 13:30:02 +08:00
Damyon Wiese
05a6445a14 MDL-37148 Assignment: Lots more webservices
This patch adds lots of webservices to the assignment module.
* mod_assign_revert_submissions_to_draft
* mod_assign_lock_submissions
* mod_assign_unlock_submissions
* mod_assign_save_submission
* mod_assign_submit_for_grading
* mod_assign_save_grade
* mod_assign_save_user_extensions
* mod_assign_reveal_identities
* mod_assign_copy_previous_attempt

All features such as reopening attempts and marking workflow are supported through
the save_grade and save_submission functions.

Uploading files is supported by sending draft item ids for the files_filemanager param the same functions.
2013-09-13 13:29:51 +08:00
Damyon Wiese
7f43748f18 MDL-37804 assign: Return proper notice when submissions closed.
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.
2013-09-12 10:34:02 +08:00
prateeksachan
9054c04d45 MDL-38267 assign: No Submit button after cut-off date 2013-09-11 12:17:59 +08:00
Dan Poltawski
f2ee9b5c27 Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle 2013-09-10 14:58:54 +08:00
Dan Poltawski
92d92606ba Merge branch 'MDL-40631-master' of git://github.com/damyon/moodle 2013-09-10 14:33:41 +08:00
Dan Poltawski
8eb80a2c42 Merge branch 'MDL-37804' of github.com:recreate/moodle 2013-09-09 17:13:22 +08:00
Rossiani Wijaya
bea4ed1b44 MDL-41621 Assign mod: fix page heading levels 2013-09-09 10:24:19 +08:00
Damyon Wiese
3516b82c9d Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle 2013-09-04 11:45:07 +08:00
Dan Poltawski
2b1e887561 Merge branch 'MDL-40214_master' of https://github.com/markn86/moodle 2013-09-03 10:06:38 +08:00
Damyon Wiese
0d416e9c0b MDL-39992 assign: Sort grading actions in alphabetical order 2013-09-02 22:23:03 +08:00
Damyon Wiese
8fd00a2471 MDL-40631: Prevent students from submitting empty assignments. 2013-09-02 21:59:15 +08:00
Dan Poltawski
56b9e0b565 Merge branch 'MDL-41149-master' of git://github.com/damyon/moodle 2013-09-02 17:25:27 +08:00
Rajesh Taneja
3b908929c1 MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type 2013-08-30 11:07:48 +08:00
Damyon Wiese
1149b5d205 MDL-41249 assign: Fix incorrect gradingform restore step
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
2013-08-28 16:29:19 +08:00
Colin Campbell
58672659c6 MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore. 2013-08-28 10:52:47 +08:00
Dan Poltawski
aa8fe63937 Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle 2013-08-26 15:09:33 +08:00
Frederic Massart
725dfe6a54 MDL-40055 mod_assign: Wrong namespace when throwing exception 2013-08-26 14:21:34 +08:00