3c3cf6daac
Merge branch 'MDL-32499_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
2012-07-31 16:29:51 +12:00
c5b133f790
Merge branch 'MDL-33537_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
2012-07-30 13:46:33 +08:00
2011579b26
MDL-32499 gradingform_rubric Avoid backup/restore of rubric fillings without an existing criteria
2012-07-27 09:22:02 +08:00
e0cf9e280a
MDL-33537 gradingform_rubric Adding the definition when retrieving grading instances
...
Credit to Sam Chaffee
2012-07-20 14:56:00 +08:00
35cf43cb42
MDL-31516 Fixing grade_edit_tree::format_number
2012-07-17 09:03:17 -04:00
0dd189d59d
Merge branch 'MDL-18301-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-07-09 14:27:15 +08:00
2dd2bd7ead
MDL-18301 Gradebook: Added feature for components to control grade visibility
2012-07-06 09:53:54 +08:00
d0d407f0bb
MDL-33757 gradebook: Adding support to sort userlist by email address
2012-07-03 09:45:26 +08:00
cf5b51af0e
Merge branch 'wip-MDL-33521-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
2012-07-03 01:59:22 +02:00
7debccbdee
MDL-33835 Marking Guide - set currentfocus var to the first criteria comment to avoid JS errors.
2012-07-02 16:10:26 +08:00
abfc9e2512
MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files
2012-07-02 11:34:53 +12:00
b574c078a6
MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts.
2012-06-29 11:37:01 +08:00
c5e783e512
MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700
2012-06-18 02:37:00 +02:00
54588ca214
Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle
2012-06-14 12:00:18 +08:00
1812ea3e06
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()
2012-06-14 09:19:25 +07:00
c6e423695a
MDL-33477 Advanced grading Marking Guide - fix lang
2012-06-13 14:09:41 +12:00
238858e362
MDL-26277: Fixed whitespace post integration
2012-06-06 09:15:18 +12:00
e8a20ce85a
Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle
2012-06-06 09:07:34 +12:00
c84d86e0b7
MDL-30880 grade: added a check for the feedback property existing before it is used
2012-06-04 09:17:06 +07:00
c865e08fab
Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle
2012-05-28 14:56:48 +08:00
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
728ff21b9f
MDL-32860 grade: refactored graded_users_iterator
2012-05-21 09:11:25 +07:00
1e1931a797
Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle
2012-05-15 14:43:31 +08:00
1af542ed67
Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle
2012-05-14 14:20:05 +08:00
6189c7b4d3
MDL-32978 Gradebook: Fix strict standards notices
2012-05-14 13:27:06 +08:00
ef8c793d74
MDL-31804 duplicated columns cause Oracle error in grader report
2012-05-14 11:00:29 +07:00
85c85b8102
Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle
2012-05-14 10:22:21 +08:00
78ab98bc5e
MDL-27322 grade: added the ability to not have suspended students included in a grade export
2012-05-10 08:34:51 +07:00
280b223d84
MDL-26277 grade import: validate file pointer before reading
2012-05-06 20:14:55 -07:00
abf0c875bb
MDL-31731 gradeing form: Fix module name
2012-05-04 16:20:58 +08:00
cfc73aa790
MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users
2012-05-04 16:20:50 +08:00
9fdbd69e22
MDL-31731 gradeing form: Fix hardcoded module name
2012-05-04 14:02:39 +08:00
fcbd37e38a
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
2012-05-04 07:28:29 +08:00
6c20925827
MDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade as well as lower.
2012-05-04 09:33:30 +12:00
b4b1d49044
MDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning about discrepency between module maxgrade and number of marks in Marking Guide.
2012-05-04 09:12:29 +12:00
9b06d97381
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
2012-05-03 20:43:28 +08:00
e529ec8c09
MDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state when clearing both.
2012-05-03 22:12:34 +12:00
c5883e7994
MDL-18095 gradebook: Make sure grade override flag is cleared whenever required
...
The check for feedback and grade equality between recorded values and the current
form ones before removing override flag is not really required.
2012-05-08 11:53:31 +01:00
1470c0f46e
Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle
2012-05-02 17:44:35 +12:00
1e2698f6fa
MDL-26275 grade: made some equality checks more strict and added some explanatory comments
2012-05-01 10:43:09 +07:00
b53cb1294a
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
2012-04-30 12:54:22 +08:00
a740a0ad98
MDL-26257 grade: fixed the grader report edit mode ajax and fixed a spot in the grader report that should be using get_students_per_page()
2012-04-30 08:56:27 +07:00
8233747e0e
MDL-26275 grade: made the grader report retrieve the existing grades from the DB rather than sending them to the client which then returns them to the server
2012-04-30 08:56:26 +07:00
d3b698a46e
MDL-26275 grade: added a safety check to avoid hitting PHP's max_input_var by reducing the number of students per page if necessary
2012-04-30 08:56:26 +07:00
446326ab67
Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle
2012-04-30 12:46:48 +12:00
49ddf4195c
MDL-31510 grader report: Fixed whitespace
2012-04-30 12:13:00 +12:00
e074f9763b
Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle
2012-04-30 12:11:23 +12:00
77143217f2
MDL-31731 - new grading form - Marking Guide
2012-04-30 08:44:43 +12:00
692e4f7b4d
MDL-26523 grade: fixed a called to addHelpButton() that was asking for a non-existent string
2012-04-27 09:13:36 +07:00
aee748d32c
MDL-31510 grade: made the user report observe $cm->uservisible so that activities not available to a student because of groups do not appear on their user report
2012-04-26 16:31:56 +07:00
Sam Hemelryk