Commit graph

1405 commits

Author SHA1 Message Date
Dan Poltawski
2cbbf5d829 Merge branch 'MDL-33117_grade_display_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2012-10-02 09:33:09 +08:00
Andrew Davis
60b6b6280b MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability 2012-09-28 12:14:45 +08:00
Frederic Massart
7765e94f5e MDL-34931 core_grade: Fixed grades hidden when activity is hidden 2012-09-28 11:39:20 +08:00
Eloy Lafuente (stronk7)
a59f0f25cd Merge branch 'm23_MDL-35156' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-09-11 02:48:22 +02:00
Eloy Lafuente (stronk7)
d98c8fcb8e Merge branch 'MDL-34985_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE 2012-09-06 20:07:45 +02:00
Dan Marsden
43b135e598 MDL-35156 remove references to non-existant options 2012-09-03 12:42:26 +12:00
Ankit Agarwal
9fc95b6558 MDL-31633 grades: Fixing incorrect redirect when trying to edit grade letters from admin settings 2012-08-24 14:59:18 +08:00
Eric Merrill
2d0a11ee94 MDL-34985 gradebook Fixing issue where default parent in Full View Add Category could be inconsistent.
Turns out the correct default was already computed, but was not being applied to the setting.
2012-08-20 17:13:10 -04:00
Aparup Banerjee
e203643539 Merge branch 'm23_MDL-33942' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE 2012-08-07 15:58:25 +08:00
Aparup Banerjee
16a8d4d4ba Merge branch 'MDL-34559_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2012-08-07 14:37:05 +08:00
Rossiani Wijaya
74b83c18fb MDL-34559: removing accesshide class 2012-08-07 13:36:43 +08:00
Dan Poltawski
e1d2c7452b MDL-34716 outcomes: Fix admin tree location 2012-08-03 16:06:54 +08:00
Rossiani Wijaya
aa15bd56d6 MDL-34559 accessibility compliance for grade: Add forform input text and select tag 2012-08-03 12:01:36 +08:00
Dan Marsden
605d6ffcf4 MDL-33942 Grading method: Marking Guide - check for $cm before using - may not exist if the course is being deleted. 2012-08-02 19:51:24 +12:00
Sam Hemelryk
3c3cf6daac Merge branch 'MDL-32499_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE 2012-07-31 16:29:51 +12:00
Dan Poltawski
c5b133f790 Merge branch 'MDL-33537_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE 2012-07-30 13:46:33 +08:00
David Monllao
2011579b26 MDL-32499 gradingform_rubric Avoid backup/restore of rubric fillings without an existing criteria 2012-07-27 09:22:02 +08:00
David Monllao
e0cf9e280a MDL-33537 gradingform_rubric Adding the definition when retrieving grading instances
Credit to Sam Chaffee
2012-07-20 14:56:00 +08:00
Jean-Philippe Gaudreau
35cf43cb42 MDL-31516 Fixing grade_edit_tree::format_number 2012-07-17 09:03:17 -04:00
Dan Poltawski
0dd189d59d Merge branch 'MDL-18301-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-07-09 14:27:15 +08:00
Frederic Massart
2dd2bd7ead MDL-18301 Gradebook: Added feature for components to control grade visibility 2012-07-06 09:53:54 +08:00
ISHIKAWA Takayuki
d0d407f0bb MDL-33757 gradebook: Adding support to sort userlist by email address 2012-07-03 09:45:26 +08:00
Eloy Lafuente (stronk7)
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
Dan Marsden
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
Sam Hemelryk
abfc9e2512 MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files 2012-07-02 11:34:53 +12:00
Aparup Banerjee
b574c078a6 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:37:01 +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
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Andrew Davis
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
Dan Marsden
c6e423695a MDL-33477 Advanced grading Marking Guide - fix lang 2012-06-13 14:09:41 +12:00
Sam Hemelryk
238858e362 MDL-26277: Fixed whitespace post integration 2012-06-06 09:15:18 +12:00
Sam Hemelryk
e8a20ce85a Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle 2012-06-06 09:07:34 +12:00
Andrew Davis
c84d86e0b7 MDL-30880 grade: added a check for the feedback property existing before it is used 2012-06-04 09:17:06 +07:00
Dan Poltawski
c865e08fab Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle 2012-05-28 14:56:48 +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
Andrew Davis
728ff21b9f MDL-32860 grade: refactored graded_users_iterator 2012-05-21 09:11:25 +07:00
Dan Poltawski
1e1931a797 Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle 2012-05-15 14:43:31 +08:00
Dan Poltawski
1af542ed67 Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle 2012-05-14 14:20:05 +08:00
Frederic Massart
6189c7b4d3 MDL-32978 Gradebook: Fix strict standards notices 2012-05-14 13:27:06 +08:00
Jonathon Fowler
ef8c793d74 MDL-31804 duplicated columns cause Oracle error in grader report 2012-05-14 11:00:29 +07:00
Dan Poltawski
85c85b8102 Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle 2012-05-14 10:22:21 +08:00
Andrew Davis
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
Charles Fulton
280b223d84 MDL-26277 grade import: validate file pointer before reading 2012-05-06 20:14:55 -07:00
Dan Marsden
abf0c875bb MDL-31731 gradeing form: Fix module name 2012-05-04 16:20:58 +08:00
Dan Marsden
cfc73aa790 MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users 2012-05-04 16:20:50 +08:00
Dan Poltawski
9fdbd69e22 MDL-31731 gradeing form: Fix hardcoded module name 2012-05-04 14:02:39 +08:00
Dan Poltawski
fcbd37e38a Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-05-04 07:28:29 +08:00
Dan Marsden
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
Dan Marsden
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
Dan Poltawski
9b06d97381 Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-05-03 20:43:28 +08:00