mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity
67,639 Commits 36 Branches 519 Tags
Commit Graph

1637 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
4f31798dfc Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle 2014-02-03 17:58:30 +01:00
Gregory Faller
20c9f4a133 MDL-37714: Correctly identify frequently used comments during restore 2014-01-31 10:26:11 +10:30
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used. 
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
 2014-01-25 08:57:32 +11:00
Michael Aherne
780cf0a728 MDL-43440 unit tests Use correct cm identifier in unit tests 2014-01-25 08:56:43 +11:00
Frederic Massart
fb95da6f5b MDL-41688 gradebook: Improved grading layout on bootstrapbase themes 2014-01-20 10:34:03 +01:00
Eloy Lafuente (stronk7)
988c6ba1b8 Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle 
Conflicts:
	grade/tests/behat/behat_grade.php
	grade/tests/behat/grade_view.feature
 2014-01-14 22:03:02 +01:00
Eloy Lafuente (stronk7)
372a612221 Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle 2014-01-14 16:48:22 +01:00
Adrian Greeve
4e2ba4bb31 MDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings. 2014-01-14 11:59:01 +08:00
Adrian Greeve
1301a07a3e MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook. 2014-01-14 11:59:01 +08:00
Mark Nelson
8ff753857c MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317 2014-01-14 11:59:01 +08:00
Mark Nelson
4f5eaa55c5 MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317 2014-01-13 15:47:51 -08:00
Dan Poltawski
06cdbf8382 Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle 2014-01-13 15:38:22 +08:00
Frederic Massart
bfa0c3ab4f MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase 2014-01-13 08:11:07 +01:00
Dan Poltawski
0394a0eefe Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle 2014-01-06 10:06:11 +08:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Tony Butler
0aff7a5517 MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report 2014-01-02 16:39:13 +00:00
Sam Hemelryk
ec6219a2e7 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-05 08:25:35 +13:00
sam marshall
8ff1fb6ffe MDL-42084 Fix breakage in grader preferences page 2013-12-04 17:00:08 +00:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6 Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle 2013-12-03 10:25:26 +13:00
Damyon Wiese
2b267d31c8 MDL-32888: Whitespace fixes (grr) 2013-12-02 15:14:26 +08:00