Dan Poltawski 82b7d129d7 Merge branch 'MDL-43824-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE ...

Conflicts:
	theme/bootstrapbase/style/moodle.css

2014-08-12 11:08:13 +01:00

..

edit

MDL-43740 core_grade: Thanks to Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None"

2014-08-11 20:20:36 +08:00

export

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00

grading

MDL-46223 Fix frequently used comments in the marking guide

2014-07-09 16:44:28 +08:00

import

MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported.

2014-08-07 09:16:58 +08:00

report

Merge branch 'MDL-43824-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE

2014-08-12 11:08:13 +01:00

tests

Merge branch 'wip-MDL-30668-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE

2014-08-11 10:41:44 +01:00

externallib.php

MDL-31890 corrected whitespaces and phdocs

2013-09-02 10:27:12 +10:00

index.php

MDL-30999 grade: updated Grade API phpdocs

2012-02-14 14:04:19 +07:00

lib.php

MDL-41967 - Gradebook: Fixed an sql syntax error for gradebook custom profile fields.

2013-10-01 17:53:22 +08:00

querylib.php

MDL-45323 grade: Fix query errors on grade_get_grade_for_activity method.

2014-05-15 15:05:40 +08:00