1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 12:10:34 +01:00

840 Commits

Author SHA1 Message Date
Petr Škoda
40b9c0694c MDL-36436 use hacky aspect ratio to work around IE9 issues 2012-11-20 13:01:27 +01:00
Frederic Massart
06b7ed0a45 MDL-36415 usability: Use new up/down and ordering icons 2012-11-16 12:47:09 +08:00
Dan Poltawski
05f2bdea31 Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle 2012-11-12 10:36:16 +08:00
Dan Poltawski
63fc21b4e5 Merge branch 'MDL-26349-workshop-grades-display' of git://github.com/mudrd8mz/moodle 2012-11-07 16:32:43 +08:00
David Mudrák
3cb4ce45c7 MDL-26349 Display the workshop final grades to participants when the activity is closed 2012-11-07 09:08:38 +01:00
Dan Poltawski
defcb763fe Merge branch 'MDL-36209-workshop-assess-while-evaluating' of git://github.com/mudrd8mz/moodle 2012-11-07 15:30:38 +08:00
Dan Poltawski
90a23f067c Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle
Conflicts:
	theme/standard/style/course.css
2012-11-06 14:58:49 +08:00
Barbara Ramiro
2df53c3ed8 MDL-36277 Usability: New Activity icons in SVG and PNG formats 2012-11-06 00:02:31 +08:00
David Mudrák
4affa7242e MDL-36209 Allow teachers to assess submissions during the grading evaluation phase 2012-11-04 08:47:21 +01:00
David Mudrák
54abf6df70 MDL-35421 Support the new conclusion field in backup and restore 2012-11-01 17:36:40 +01:00
David Mudrák
4c61fcd825 MDL-35421 Display the conclusion when the workshop is closed
There is a new task implemented for the teachers so they are expected to
provide the conclusion at the end of the assessment phase.
2012-11-01 17:36:40 +01:00
David Mudrák
5a49f825bd MDL-35421 Make the new conclusion field editable via mod_form 2012-11-01 17:36:40 +01:00
David Mudrák
d898206247 MDL-35421 Add conclusion text fields into the workshop table 2012-11-01 17:36:40 +01:00
Dan Poltawski
e76cc8f4c0 Merge branch 'MDL-36135-evaluators' of git://github.com/mudrd8mz/moodle 2012-10-30 09:37:03 +08:00
David Mudrák
dc1e95c96a MDL-35422 Fix the confusing submit button label 2012-10-24 17:43:28 +08:00
David Mudrák
462b4c128c MDL-36086 Fix SQL parameters array 2012-10-20 00:25:27 +08:00
David Mudrák
4f11517667 MDL-36135 Give the grading evaluation methods control over their settings forms
From now on, the evaluator's method get_settings_form() should return a
subclass of workshop_evaluation_settings_form. The evaluation subplugins
are expected to use the define_sub() method to add their own fields into
the base form, although they can override the main define() method, too.

The former interface workshop_evaluation has been refactored into a
superclass with abstract methods which seems to be more robust.

Oh, by the way, I'm in Perth - yay!

AMOS BEGIN
 MOV [settings,workshopeval_best],[evaluationsettings,mod_workshop]
AMOS END
2012-10-20 00:17:13 +08:00
David Mudrák
a93dc3ecb7 MDL-36135 Display the workshop grading evaluation method chooser
Teachers can now choose the actual grading evaluation method to use
during the grading evaluation phase. The workshopeval_best is still used
as the default one (this may be made configurable later, although there
is no big benefit of it).
2012-10-20 00:17:13 +08:00
Sam Hemelryk
f7de90a74a MDL-33857 fixed up whitespace 2012-10-16 13:32:34 +08:00
Sam Hemelryk
2bbf03ce3b Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle 2012-10-16 13:31:44 +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
Marina Glancy
43aadf0401 MDL-33857 Increase performance of queries for Server files repository (small improvements) 2012-10-10 15:21:27 +08:00
Marina Glancy
b8de262139 MDL-33857 Increase performance of queries for Server files repository
- file_info class now has new methods get_non_empty_children and count_non_empty_children; added default implementation;
- all core classes extending file_info have their implementation of those methods;
- class repository_local_file used for caching get_children() results is removed;
- class repository_local rewritten to use new methods from file_info;
- added caching of retrieved modules in file_browser::get_file_info_context_module() - this query is slow and executed multiple times on big servers
2012-10-10 15:21:26 +08:00
Tim Hunt
e451c11616 MDL-34657 workshop / user sorting: fix SQL regression. 2012-10-04 11:47:04 +01:00
Tim Hunt
9695ff811b MDL-34657 user sorting: consistent sorting everywhere.
This commit coverts everything in the codebase to use the new
users_order_by_sql function when sorting lists of users. More details in
the bug.

Note that this does not change places where users are displayed in a
sortable table, and the sort order comes from the table.
2012-09-27 12:41:42 +01:00
David Mudrák
b615c46821 MDL-34725 Make the signatures of process_legacy_element() method consistent
The patch fixes the missing parameter type declaration in all subclasses
of the moodle1_workshopform_handler class.
2012-08-29 15:35:37 +02:00
Eloy Lafuente (stronk7)
92f2403bf3 Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle 2012-08-15 03:18:58 +02: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
Kanika Goyal
50da4ddd56 MDL-34382: Plagiarism API - add new option to flag modules that support the use of plagiarism plugins 2012-08-13 11:02:34 +05:30
Dan Poltawski
31f29535d1 Merge branch 'master_MDL-32227_add_plagiarism_api_support_to_workshop' of git://github.com/kanikagoyal/moodle 2012-07-30 13:34:20 +08:00
Kanika Goyal
67ba9007b7 MDL-32227: Plagiarism API - add support for plagiarism api to workshop module 2012-07-24 01:52:54 +05:30
Ankit Agarwal
0bbe041b77 MDL-34470 workshop: Replace all instances of get_context_instance() with context_xxx::instance() in mod/workshop 2012-07-23 15:10:07 +08:00
Sam Hemelryk
d75e8e3ac8 MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files 2012-07-02 11:34:44 +12:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Adrian Greeve
35ca63c166 MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded. 2012-06-20 10:49:18 +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
Dan Poltawski
1ae5eb704a Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle 2012-06-14 12:29:14 +08: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
Sun Zhigang
4714f5323a MDL-33035 workshop: typo in strings 2012-05-22 19:22:12 +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
Dongsheng Cai
6723372514 MDL-28666 Extends repository to support references
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
2012-05-21 11:57:51 +08:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
2012-05-18 00:27:04 +08:00
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Dan Poltawski
e87a7c65f1 Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle 2012-05-14 10:41:46 +08:00
Dan Poltawski
41ea0d3cc2 Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle 2012-05-14 10:28:05 +08:00
Petr Skoda
d59ef9c5ab MDL-32926 exorcise setUser(2) evil from phpunit 2012-05-12 21:42:07 +02:00
David Mudrak
d20bffa2fd MDL-32714 workshop: fixed SQL to load assessment form fields
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
2012-05-12 10:27:34 +02:00
Ankit Agarwal
3afe75a79c MDL-31902 general: Removing deprecated functions 2012-05-11 10:30:40 +08:00
Frederic Massart
114dd080e1 MDL-32718 Fixed typo in column name 2012-05-08 15:54:11 +08:00
David Mudrak
6c09cb4a64 MDL-32718 fixing an SQL typo in workshop_get_recent_mod_activity() 2012-05-07 10:02:41 +02:00