Commit graph

1678 commits

Author SHA1 Message Date
Marina Glancy
36e2b86dd3 Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle 2014-08-12 13:29:15 +08:00
Andrew Davis
93dbb21841 MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:15:00 +08:00
Dan Poltawski
0bd41a9ccf Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle 2014-08-11 10:41:40 +01:00
Damyon Wiese
5232d3f2c9 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 15:53:47 +08:00
Damyon Wiese
d2e9fc5845 MDL-35984 grade: Add behat tests for grade aggregations 2014-08-11 15:53:41 +08:00
Marina Glancy
9fe5a1b8f4 MDL-30668 gradereport_grader: split user preferences into individual courses
This solves the DB exception when users were trying to insert very large string in DB
2014-08-08 15:13:58 +08:00
Rajesh Taneja
cc41342290 MDL-46175 behat: Fixed lang changes in gradebook 2014-08-07 09:39:58 +08:00
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Damyon Wiese
9871a438f8 MDL-46548 grades: Reorder grade export form.
Move the list of grade items to the top, and leave them expanded by default.

Move the idnumber warning into the grade items section, now it is visible by default.
2014-08-04 16:24:47 +08:00
Damyon Wiese
8d395db4c3 MDL-46548 grades: Add upgrade.txt for gradeexport plugins 2014-08-04 16:18:33 +08:00
Damyon Wiese
8cd07ed02a MDL-46548 grades: Remove file upload tags 2014-08-04 16:18:32 +08:00
Damyon Wiese
8023a71b9a MDL-46548 grades: Add behat test for xml export 2014-08-04 16:18:32 +08:00
Damyon Wiese
26b0c96f5b MDL-46548 grades: Add behat test for csv export 2014-08-04 16:18:32 +08:00
Damyon Wiese
ad5ab383e6 MDL-46548 behat: Prevent force file save as for some pages we want to test with behat. 2014-08-04 16:18:32 +08:00
Damyon Wiese
6c6d05a651 MDL-46548 grades: Add warning to export form when users with no idnumber are excluded. 2014-08-04 16:18:25 +08:00
Andrew Davis
e54e51931d MDL-46175 core_grading: updated grading related strings 2014-08-01 10:28:57 +08:00
Damyon Wiese
97908a2225 MDL-46548 grades: Update xml grade export to support one step exports. 2014-07-31 17:00:14 +08:00
Damyon Wiese
9f5834ccc7 MDL-46548 grades: Update xls grade exporter to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
1cc43058a8 MDL-46548 grades: Update ods grade export to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
cca51baa07 MDL-46548 grades: Add support for simplified one-step exports and update txt exporter
This ui change requires changes to the API so I have deprecated the old functions while maintaining
compatibility (if you don't mind lots of debugging).
2014-07-31 17:00:01 +08:00
David Mudrák
db5a6e6560 MDL-46223 Fix frequently used comments in the marking guide
When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.
2014-07-09 16:42:39 +08:00
David Mudrák
6c3264a22a MDL-46223 Improve the display of marking guide validation message 2014-07-09 16:42:37 +08:00
David Mudrák
18619d8440 MDL-46223 Improve the marking guide output 2014-07-08 13:22:50 +08:00
David Mudrák
b9b2968e8a MDL-46223 Improve the rubric output 2014-07-08 13:22:50 +08:00
Sam Hemelryk
4264ed8454 Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle 2014-07-08 09:28:20 +12:00
Frederic Massart
3774d40f8c MDL-16474 scale: Allow scales with 1 item 2014-06-30 14:24:24 +08:00
Charles Fulton
30cc5d70ce MDL-43347 grades: convert keep highest to text field 2014-06-26 07:33:07 -07:00
Charles Fulton
74dd7a3e84 MDL-43347 grades: consistent interface for drop lowest setting 2014-06-25 11:10:04 -07:00
Rajesh Taneja
955118d831 MDL-43835 behat: Fixed matches for select form field 2014-06-25 12:54:52 +08:00
Adrian Greeve
06dc1e7f56 MDL-36003 events: Added events for viewing grade reports. 2014-06-23 11:59:35 +08:00
Paul Charsley
0ff4ebb4a3 MDL-31861 add web service function save_definitions 2014-06-13 15:36:25 +12:00
Rajesh Taneja
ddfbdf0924 MDL-45769 Behat: Fixed behat, was failing because of xpath chaining 2014-06-09 09:56:39 +08:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Simey Lameze
1468444f42 MDL-45323 grade: Unit test for grade_get_grade_items_for_activity() 2014-05-15 15:00:56 +08:00
Simey Lameze
3a34659252 MDL-45323 grade: Fix query errors on grade_get_grade_for_activity method. 2014-05-15 15:00:03 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Jetha Chan
73eb9f4339 MDL-45290 rubric: visual fixups
Fixed up visual issues with rubric editor on Clean.
2014-05-02 14:27:14 +08:00
Andrew Davis
08b90682e4 MDL-45314 core_grade: a JS fix for the grader report 2014-05-02 11:13:45 +08:00
Andrew Davis
85b609c938 MDL-45314 core_grade: keep the two grader report scrollbars the same when the table changes width 2014-05-01 11:57:45 +08:00
Frederic Massart
3f32733702 MDL-44004 grading_rubric: Ensure that score is set before using it 2014-04-24 16:21:07 +08:00
Adrian Greeve
1283bad691 MDL-45037 gradebook: Allow dashes in xml grade values to be ignored.
This was delivering an error message when trying to import an exported
xml file (from Moodle).
2014-04-14 10:46:29 +08:00
Dan Poltawski
a935cccb2b Merge branch 'MDL-31679' of git://github.com/aolley/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 12:49:35 +08:00
Dan Poltawski
1b9a1e8128 Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle 2014-04-09 11:38:42 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
Justin Filip
4400033004 MDL-22999 code_grades: Added Behat tests for configurable grade point maximum. 2014-04-07 16:02:37 -04:00
sam marshall
8d1f33e122 MDL-44070 Conditional availability enhancements (6): core changes
Changes core code to use new API instead of the old one when
checking user access to activities and sections.

Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
Marina Glancy
b3d75528de Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle 2014-04-01 17:40:35 +08:00
Marina Glancy
e57f83a5c0 Merge branch 'MDL-44701' of git://github.com/aolley/moodle 2014-04-01 11:06:23 +08:00
Petr Škoda
ffe60f5bbd MDL-40910 add new core event user_graded
This event is triggered when teacher manually edits the grade in gradebook.
2014-03-29 15:34:11 +08:00
Adam Olley
0f204015a6 MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present 2014-03-27 11:10:25 +10:30