Sam Hemelryk
5adf3ec6cb
Merge branch 'MDL-32499_master' of git://github.com/dmonllao/moodle
2012-07-31 16:30:05 +12:00
Dan Poltawski
73454d017a
Merge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle
2012-07-30 13:46:22 +08:00
David Monllao
b4b6fc9155
MDL-32499 gradingform_rubric Avoid backup/restore of rubric fillings without an existing criteria
2012-07-27 09:13:21 +08:00
Aparup Banerjee
821fbfe4f5
Merge branch 'wip-mdl-31294' of git://github.com/rajeshtaneja/moodle
2012-07-24 16:57:58 +08:00
Dan Poltawski
4ea5885e87
Merge branch 'wip-MDL-34463-master' of git://github.com/abgreeve/moodle
2012-07-24 16:16:45 +08:00
Rajesh Taneja
c277b502ab
MDL-31294 Forms Library: Removed deprecated functions from forms library
2012-07-24 15:09:39 +08:00
Adrian Greeve
d40604724b
MDL-34463 - lib - Alteration of the get_context_instance function to utilize the new function context_XXXX::instance().
2012-07-24 14:04:40 +08:00
Dan Poltawski
5082d87c03
Merge branch 'wip-mdl-32940' of git://github.com/rajeshtaneja/moodle
2012-07-24 13:39:59 +08:00
Aparup Banerjee
acb88dbed3
Merge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle
2012-07-24 12:14:17 +08:00
Rajesh Taneja
61cca0b7fc
MDL-32940 libraries: Replaced deprecated PARAM_NUMBER with PARAM_FLOAT
2012-07-23 17:21:05 +08:00
Dan Poltawski
a5c8e33122
Merge branch 'wip-mdl-32945' of git://github.com/rajeshtaneja/moodle
2012-07-23 13:35:24 +08:00
Jean-Philippe Gaudreau
dacd5daa7a
MDL-31516 Fixing grade_edit_tree::format_number
2012-07-23 12:21:50 +12:00
David Monllao
8fea05bfb4
MDL-33537 gradingform_rubric Adding the definition when retrieving grading instances
...
Credit to Sam Chaffee
2012-07-20 14:57:34 +08:00
Rajesh Taneja
405aca3532
MDL-32942 libraries: Replaced deprecated PARAM_ACTION and PARAM_FORMAT with PARAM_ALPHANUMEXT
2012-07-19 15:46:10 +08:00
Rajesh Taneja
071e68f93e
MDL-32945 libraries: Replaced deprecated PARAM_MULTILANG with PARAM_TEXT
2012-07-19 15:44:40 +08:00
Frederic Massart
61c8e0d75f
MDL-21572 Gradebook: Do not export fields when missing permissions
2012-07-18 12:56:57 +08:00
Charles Fulton
293f42b67a
MDL-21572 grade: make user profile fields configurable
2012-07-13 09:00:12 +08:00
Dan Poltawski
4e85084148
Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle
2012-07-09 14:27:10 +08:00
Frederic Massart
455dc0de61
MDL-18301 Gradebook: Added feature for components to control grade visibility
2012-07-06 09:52:46 +08:00
Dan Poltawski
d3faa829cd
Merge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle
2012-07-03 09:45:12 +08:00
ISHIKAWA Takayuki
69101b4392
MDL-33757 gradebook: Adding support to sort userlist by email address
2012-07-03 09:09:05 +08:00
Eloy Lafuente (stronk7)
f1d9ceb0e4
Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle
2012-07-03 01:58:48 +02:00
Dan Poltawski
b96c32fbef
Merge branch 'master_MDL-33835' of git://github.com/danmarsden/moodle
2012-07-02 16:09:59 +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
Dan Marsden
0c4390ed21
MDL-33835 Marking Guide - set currentfocus var to the first criteria comment to avoid JS errors.
2012-06-20 11:48:24 +12: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