Commit Graph

326 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 663dbbc2e6 MDL-36933 Bump everything to 2012112900
(versions, requires and dependencies)
2012-11-30 03:30:09 +01:00
Mark Nelson 3774324174 MDL-33791 Portfolio: Fixed security issue with passing file paths. 2012-11-08 00:26:13 +01:00
Sam Hemelryk 02adb1e30d Merge branch 'wip-mdl-29689' of git://github.com/rajeshtaneja/moodle 2012-11-06 10:34:06 +13:00
Dan Poltawski 752a3f14be Merge branch 'wip-mdl-35910' of git://github.com/rajeshtaneja/moodle 2012-10-30 10:00:11 +08:00
Rajesh Taneja 7212740691 MDL-35910 Assignment 2.2: Fixed included files in assignment zip.
If Marking button is enabled, assignment is open and is not finalized, then don't add file to zip
2012-10-19 16:07:19 +08:00
Marina Glancy 71a56e08c8 MDL-35339 avoid using get_all_sections(), get_all_mods() and field section.sequence directly 2012-10-15 14:08:13 +08:00
Rajesh Taneja 17bf85dee3 MDL-29689 Assignment 2.2: cleaned print_responsefiles function 2012-10-04 16:23:19 +08:00
Rajesh Taneja deba4dc328 MDL-29689 Assignment 2.2: A student can see feedback for assignments with no-grades 2012-10-04 16:23:18 +08:00
Jean-Philippe Gaudreau 7f40888801 Fixing feedback's view when assignment is set to no grade. Also refactoring the use of method view_feedback for upload (single and advenced) assignments
Conflicts:

	mod/assignment/type/upload/assignment.class.php
	mod/assignment/type/uploadsingle/assignment.class.php
2012-10-03 14:41:32 +08:00
Rajesh Taneja c517046e4d MDL-30121 Assignment 2.2: Draft submission files will not be included in zip, if activity is open 2012-08-24 09:48:45 +08:00
Kanika Goyal 67fbfe8b54 MDL-34593: Plagiarism API - add extra plgin param to get_form_elements_module 2012-08-13 20:31:45 +05:30
David Monllao 01a67102e6 MDL-34466 mod_assignment Replace all instances of get_context_instance() with respective context_XXXX class in mod/assignment 2012-07-27 13:25:05 +08:00
Rossiani Wijaya 75cf84ac25 MDL-26969 Assignment module - upload: fixed get_submission() return value to nothing when param is set to false. 2012-07-23 11:19:30 +08:00
Sam Hemelryk cbbdc7db2a Merge branch 'master_MDL-32228_add_plagiarism_api_support_to_online_assignment_type' of git://github.com/kanikagoyal/moodle 2012-07-16 10:35:34 +12:00
Kanika Goyal 93d52d84ec MDL-32228: Plagiarism API - add support for plagiarism api to online assignment type 2012-07-11 23:04:56 +05:30
Rossiani Wijaya b8ba23ca23 MDL-31987 Assignment module: Assignment count submissions correctly.
For advanced upload assignment, store file count of each submission
into assignment_submissions.numfiles

When counting submissions, if the assignment is open and tracking
drafts, only submissions which has send for marking are counted.
Otherwise, submissions which has numfiles > 0 are counted.

Also change a hardcoded 'submitted' to ASSIGNMENT_STATUS_SUBMITTED.

This patch was originally written by: Sunner Sun <sunner@gmail.com>.

I made some modifation to fixed count_real_submissions() query (ref: MDL-32207) in /mod/assignment/type/upload/assignment.class.php file
2012-07-02 14:26:45 +08:00
Eloy Lafuente (stronk7) c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Marina Glancy c469b3963b MDL-33446 Editor form field can filter return types
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
2012-06-12 11:03:43 +08:00
Marina Glancy 559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
2012-05-21 16:01:04 +08:00
Christopher Tombleson 4447223b38 MDL-31028: Added pathname hashes to eventdata
Also fix strict standard warning
2012-05-09 13:46:20 +12:00
Eloy Lafuente (stronk7) d7f84a2962 Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle 2012-04-25 15:14:27 +02:00
David Mudrak b861b60932 MDL-32471 fixed strict standards in the declaration of send_file() in assignment types
All subtypes declaration should be compatible with that of assignment_base::send_file()
2012-04-25 13:48:12 +02:00
Eloy Lafuente (stronk7) 2ae4f3849a Merge branch 'MDL-32490' of git://github.com/bostelm/moodle 2012-04-25 02:28:50 +02:00
David Mudrak 261cbbacc1 MDL-32471 preview thumbnails support for activity modules
Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.
2012-04-24 12:09:45 +02:00
Petr Skoda cdbea7eed1 MDL-31607 use full course object for require_login() if already available
This eliminates 1 db query.
2012-04-22 17:41:47 +02:00
Henning Bostelmann 2159c1eaed MDL-32490 Offline assignment: do not display lateness information 2012-04-19 19:27:11 +01:00
Dan Poltawski 17e2b27d31 MDL-29400 assignment: Require a file to be uploaded in form
Don't display 'File uploaded successfully' when no file uploaded for
both upload and uploadsingle
2012-03-26 11:19:57 +13:00
Petr Skoda e7755fc627 MDL-32094 fix E_STRICT issues in assignment 2012-03-18 18:32:17 +01:00
Sam Hemelryk db6d54c337 Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:10:00 +13:00
Sam Hemelryk 48c6ebebbf MDL-30724 mod_assignment: Minor fixes during integration 2012-03-05 16:09:55 +13:00
Ruslan Kabalin 2ce6d12f58 MDL-31808 Upload assignment: fix user feedback display 2012-02-28 11:15:03 +00:00
Gerard (Gerry) Caulfield 8caba22968 MDL-30724 Limit assignment_count_real_submissions() to only select real
submissions

I've also refactored some code so that it is more structured and allows
for easier overriding of function associated with counting submissions
and updated associated doc blocks.
2012-02-27 12:24:48 +08:00
Gerard (Gerry) Caulfield ad2d5eba0b MDL-30957 Adding a new method "is_complete" to assignment lib for
testing if a submission has actually been submitted and then adding a
call to it before displaying the the assignment submission date header

As recommended I've simplified the functions and split the logic out into appropriate upload classes.
2012-02-20 11:34:38 +08:00
Eloy Lafuente (stronk7) 91c10ddfa0 Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle 2011-12-22 09:48:23 +01:00
Gerard (Gerry) Caulfield 229278a71b MDL-29400 Fixing unset object bug encountered by Rajesh during testing 2011-12-22 14:00:44 +08:00
Eloy Lafuente (stronk7) 1af989f758 Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle 2011-12-20 22:53:12 +01:00
Marina Glancy d021e5b40c MDL-30733: synchronizing view_feedback with parent function to work with advanced grading
assignment_upload::view_feedback was overriden. It is altered the same way as parent function was to work with advanced grading and so it is displayed correctly in user complete report
2011-12-15 16:44:14 +08:00
Gerard (Gerry) Caulfield d6d8c49432 MDL-29400 Update the upload and uploadsingle assignment classes to so
that they only display the assignment submitted status when it has
actually been submitted.
2011-12-14 05:54:10 +08:00
Eloy Lafuente (stronk7) 59e6df2883 MDL-30007 standardise assignment subplugin lang files 2011-12-01 00:42:25 +01:00
Petr Skoda 37c48acb45 MDL-30007 standardise assignment plugin version files 2011-11-29 22:15:28 +01:00
Aparup Banerjee 3730e077fc Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle 2011-11-08 15:18:22 +08:00
Gerwood Stewart 2388e7ca7d MDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing a submission object that isn't one (in this case is a Boolean value). This will result in both methods now returning false. Kick on effect is that it corrects the bug described in MDL-27521 by removing the button if it isn't possible to finalize the submission. 2011-11-01 11:35:39 +08:00
Dan Marsden da69510f2a MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist 2011-10-26 10:59:13 +13:00
Stephen Bourget e4784b616a MDL-29698 Assignment: Fix broken logentry 2011-10-16 18:26:38 +02:00
Henning Bostelmann db3543428f MDL-16553 Assignment, student view: show response files when no grade available 2011-10-07 23:22:31 +01:00
Sam Hemelryk 91d284c145 MDL-29186 multilang Reviewed the uses of course fullname and ensured things were being formatted consistently 2011-09-08 09:38:46 +12:00
Rajesh Taneja e9de1cf49c MDL-27896 context - Fixed editor context to observe filter status 2011-08-12 11:33:21 +08:00
Sun Zhigang 0e30d4c7c7 MDL-27934 Upload Assignment - Remove useless code 2011-07-02 09:52:28 +01:00
Aparup Banerjee b74b347aba MDL-27960 assignment subplugin moodle1 conversion handling and handlers added 2011-07-01 19:11:29 +08:00
Petr Skoda 99d19c13ae MDL-25855 some more missing filelib includes 2011-01-23 18:34:41 +01:00