mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 22:12:56 +02:00
Code Issues Projects Releases Wiki Activity
69,059 Commits 36 Branches 527 Tags
Commit Graph

1658 Commits

Author SHA1 Message Date
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
Damyon Wiese
5f3ea8cf66 MDL-43883 Atto behat: Rubrics are expecting magic tweaking in text from tinymce. 2014-03-26 10:01:49 +08:00
Frederic Massart
40c0903edf MDL-44357 gradereport_grader: Fix wrong style causing LESS to fail 2014-03-24 15:15:03 +08:00
Jonathan Champ
643e341cc0 MDL-29572 Grade Import: Avoid creating invalid temporary rows; Provide feedback on error 2014-03-22 21:41:20 -04:00
Adam Olley
19213efb98 MDL-31679 gradereport_grader: Add a horizontal scroll bar to the top of the grader report 2014-03-19 16:27:21 +10:30
Sam Hemelryk
7aafc49c18 Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle 2014-03-18 09:03:21 +13:00
Marina Glancy
c83a1da7d9 Merge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle 2014-03-17 16:20:58 +08:00
Petr Škoda
a446fc00fb MDL-44603 fix incorrect hint for grades related class location 
Thanks Marina!
 2014-03-17 12:57:21 +08:00
Trevor Cunningham
9c35f55a05 MDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide 2014-03-17 08:59:08 +13:00
Petr Škoda
0fa50262e0 MDL-44603 fix core_grading_external class and test location 2014-03-15 11:08:21 +08:00
Gilles-Philippe Leblanc
3d90e53dab MDL-44585 grade_import: Restrict the accepted types in the gradebook import 2014-03-14 07:21:02 -04:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files 
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
 2014-02-27 18:22:05 +08:00
Eloy Lafuente (stronk7)
a6d5288e41 Merge branch '44104-27' of git://github.com/samhemelryk/moodle 2014-02-18 01:46:47 +01:00
Dan Poltawski
3b854e8c2a Merge branch 'MDL-42618_master' of git://github.com/SWiT/moodle 2014-02-17 12:13:39 +08:00
Sam Hemelryk
1f6ba1809d MDL-44104 admin, grade: fixed use of @params 2014-02-16 12:14:30 +13:00
David Monllao
38f0b67b71 MDL-44037 behat: New feature -> publishing rubric templates 
This patch automates MDLQA-1186; rubrics can be
shared as templates.
 2014-02-12 16:28:42 +08:00
David Monllao
b408987d3e MDL-42404 behat: Covering MDL-39710 with behat features 
I've contributed to a large an ugly scenario
in favour of performance as separating it in another
scenario or feature would add 3 or 4 minutes to the suite.
 2014-02-12 16:07:46 +08:00
David Monllao
993f26bdd2 MDL-42404 behat: Adding feature to test reusing user's rubrics 
Automates MDLQA-1187, teachers can reuse their
rubrics in other activity.
 2014-02-12 16:07:46 +08:00
David Monllao
37fcfd9911 MDL-42404 behat: Adding rubrics step definitions 2014-02-12 16:07:46 +08:00
David Monllao
d57eda7278 MDL-42404 behat: Adding edit rubrics feature 
Automates the following MDLQA-1185, MDLQA-1188
and MDLQA-1427. All of them related with the
expected outcomes after editing rubrics definitions
that were already used to grade students.
 2014-02-12 16:07:44 +08:00