moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69468 commits 37 branches 540 tags 1.3 GiB
Commit graph

1715 commits

Author SHA1 Message Date
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
Damyon Wiese
7363aacb65 Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle 2013-12-02 15:01:37 +08:00
Petr Škoda
a377754770 MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:29:08 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Matt Switlik
3f7bd81912 MDL-42618 fix grade importing of whitespace idnumbers 2013-11-14 09:46:54 -05:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Mary Evans
de957f5848 MDL-40971 grade: Importing Outcomes breaks Clean theme. 2013-10-30 23:46:47 +00:00
Melissa Aitkin
02d1a0a575 MDL-32888 Grader report: Refined SESSION and api function use 2013-10-17 12:58:49 +11:00
Melissa Aitkin
d1a4346f86 MDL-32888 Grader report: use SESSION object and DB functions 2013-10-17 12:58:49 +11:00
Melissa Aitkin
d5f6d9ebef MDL-32888 Grader report: cater for suspended students 2013-10-17 12:58:49 +11:00
Melissa Aitkin
4187784925 MDL-32888 Grader report: refined user search with no reset 2013-10-17 12:58:49 +11:00
Melissa Aitkin
cbe8e5b325 MDL-32888 Grader report: refined user search 2013-10-17 12:58:49 +11:00
Melissa Aitkin
8e4bf6cca6 MDL-32888 Grader report: added user search 2013-10-17 12:58:48 +11:00
Dan Poltawski
00ae230f52 Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-10 10:31:44 +08:00
Damyon Wiese
6412c972e3 Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle 2013-10-09 12:46:14 +08:00
Andrew Davis
accdf036fa MDL-41379 core_outcome: added some CSS to the course outcome table to make it display nice 2013-10-06 10:00:25 +07:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor. 
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
 2013-10-02 12:49:30 +08:00
Adrian Greeve
c1735baff5 MDL-41967 - Gradebook: Fixed an sql syntax error for gradebook custom profile fields. 2013-10-01 17:53:22 +08:00
Sam Hemelryk
c392392725 Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle 2013-10-01 09:54:26 +13:00
Eric Merrill
e3a65c9eab MDL-37973 gradebook Return a maxgrade of '-' if grade type is TEXT 
Including tests for correct return from
grade_edit_tree_column_range->get_item_cell()
 2013-09-19 10:21:35 -04:00
Sam Hemelryk
0dd46bb851 Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle 2013-09-17 08:39:14 +12:00
Sam Hemelryk
cf13da65e1 Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle 2013-09-16 13:13:41 +12:00