mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-02 14:28:30 +02:00
Code Issues Projects Releases Wiki Activity
70,771 Commits 37 Branches 536 Tags
Commit Graph

1987 Commits

Author SHA1 Message Date
Damyon Wiese
e30a684a4b Merge branch 'master_MDL-33939' of https://github.com/danmarsden/moodle 2014-10-29 13:23:28 +08:00
Dan Poltawski
08f289c617 MDL-47703 fix trailing whitespace 2014-10-28 12:21:30 +00:00
Dan Poltawski
31d6d2ae41 Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle 2014-10-28 11:40:27 +00:00
Dan Poltawski
7c636855e2 Merge branch 'MDL-47839-master' of git://github.com/FMCorz/moodle 2014-10-27 08:01:33 +00:00
Frederic Massart
f2823ec4bc MDL-47839 core_grades: Minor styling improvements to setup/user report 2014-10-27 15:59:21 +08:00
Rajesh Taneja
d6040f0366 MDL-47676 core_grades: reset is hidden in menu, using proper step 2014-10-27 15:21:11 +08:00
Frederic Massart
37fc69a019 MDL-47703 core_grades: Behat test for (non) aggregated scales 2014-10-27 13:00:58 +08:00
Frederic Massart
8b5c454562 MDL-47703 core_grades: Prevent use of weights with non-aggregated scales 2014-10-27 11:23:54 +08:00
Dan Poltawski
519fd3dd4c Merge branch 'wip-MDL-47760-master' of git://github.com/marinaglancy/moodle 2014-10-24 15:18:32 +01:00
Zachary Durber
5b2571547f MDL-47873 gradebook: Fix for missing override checkboxes. 2014-10-24 14:39:20 +01:00
Dan Poltawski
7dc62ed3cb Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle 2014-10-24 14:30:44 +01:00
Damyon Wiese
4bb46504ee Merge branch 'wip-MDL-47542-master' of git://github.com/marinaglancy/moodle 2014-10-24 11:49:19 +02:00
Marina Glancy
079b2e5202 MDL-47542 core_grades: action menu for grade setup 2014-10-24 11:49:19 +02:00
Damyon Wiese
996de187a5 MDL-47704 Grades: Behat fix - dropped items have no contribution 
We see "-" instead of "0.00 %"
 2014-10-24 11:49:17 +02:00
Damyon Wiese
d8e98c3178 Merge branch 'MDL-47637-master-fixup' of https://github.com/FMCorz/moodle 2014-10-24 11:49:17 +02:00
Frederic Massart
2eb60f110d MDL-47637 core_grades: Remove extra credit field in outcome test 2014-10-24 11:49:16 +02:00
Damyon Wiese
0ce4642864 MDL-47838 gradereport_singleview: Reuse get_element_header instead of rolling our own. 
This means the grade.php / index.php is kept in one place.
 2014-10-24 11:49:15 +02:00
Damyon Wiese
d700fa463e Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle 2014-10-24 11:48:25 +02:00
Zachary Durber
237f76ce14 MDL-47838 gradebook: Singleview fix for invalid links. 2014-10-24 11:48:24 +02:00
Sam Hemelryk
065448834c Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle 2014-10-24 11:48:22 +02:00
Sam Hemelryk
fc91acc813 Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:22 +02:00
Dan Poltawski
276af2a44d Merge branch 'MDL-47513-master' of git://github.com/andrewnicols/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
f335c9a1f1 Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle 2014-10-24 11:48:15 +02:00
Dan Poltawski
fc533908b0 Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle 2014-10-24 11:48:12 +02:00
Frederic Massart
5dd0cb7bce MDL-47762 gradereport_user: Hide contribution and weights when relevant 
The contribution and weight columns should be hidden when the course
total is because they can be used to compute the hidden course total.
 2014-10-24 11:48:07 +02:00
Marina Glancy
65504187d8 Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle 2014-10-24 11:48:06 +02:00
Damyon Wiese
edffadfd1c MDL-47763 Grades: Handle the case when a grade category is hidden. 
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
 2014-10-24 11:48:05 +02:00
Marina Glancy
1e3dc6ed9c Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle 2014-10-24 11:48:04 +02:00
Damyon Wiese
f01972d95e MDL-47836 Grades: Fix the url for the upgraded grades warning page url. 2014-10-24 11:48:03 +02:00
Damyon Wiese
a7c37934cc MDL-47713 Grades: Fix new behat test after conversion from points to % 
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
 2014-10-24 11:48:01 +02:00
Dan Poltawski
7a811fb63a Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-24 11:47:59 +02:00
Adrian Greeve
65e274d76f MDL-47676 core_grades: Behat test for negative weights. 2014-10-24 08:43:16 +08:00
Andrew Nicols
4a8c380abb MDL-47513 Fix RTL issues with grade report 2014-10-23 11:15:35 +08:00
Damyon Wiese
b0c5a9c491 MDL-47713 Grades: Update all the behat tests to use % in contribution column 2014-10-22 16:20:15 +08:00
Frederic Massart
6aeebc259a MDL-47637 core_grades: Outcomes must not be weighted when non aggregated 2014-10-22 14:58:17 +08:00
Andrew Nicols
bedcf338dc MDL-47706 gradebook: Update pageload time between changes 
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.

Different errors were seen because the millisecond rollover occurred at
different time within the test.

Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
 2014-10-22 12:56:07 +08:00
Damyon Wiese
53f26095c6 Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle 2014-10-22 10:45:57 +08:00
Juan Leyva
a7888487f0 MDL-46527 grades: grade_get_grades external function rewritten 2014-10-21 12:10:01 +02:00
Damyon Wiese
fc9150cb0e MDL-47713 Grades: Change contribution column to a percent of grademax 2014-10-21 13:50:18 +08:00
Damyon Wiese
a9a02e9170 MDL-20367 Grades: Allow real numbers as grade boundaries 
Patch by Huy Hoang (I just git-ified it).
 2014-10-21 11:15:39 +08:00
Marina Glancy
8b2d85406a Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle 2014-10-21 10:55:54 +08:00
Andrew Nicols
82e3440aec MDL-47400 gradereport_history: Fix string notempty test for Oracle 2014-10-21 10:48:28 +08:00
Dan Poltawski
83b49754d3 Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle 2014-10-20 18:12:38 +01:00
Marina Glancy
2d2661e3d7 Merge branch 'MDL-47503-master' of git://github.com/damyon/moodle 2014-10-20 17:08:20 +08:00
Damyon Wiese
eafab79941 MDL-47503 Grades: Display the notice about upgraded grades on all grade report pages. 
Moved this to the print_grade_page_head function and added an access check so it only
displays for teachers.
 2014-10-20 16:15:51 +08:00
Andrew Nicols
a07ec4565f MDL-47400 gradereport_history: Ensure float precision is enforced 
Format floats according to the grade item config.
 2014-10-20 15:42:31 +08:00
Marina Glancy
f75f2ecdf4 Merge branch 'MDL-47489-master' of git://github.com/FMCorz/moodle 2014-10-20 15:19:57 +08:00
Marina Glancy
1d67a8f209 Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle 2014-10-20 15:06:29 +08:00
Frederic Massart
263bf1a10f MDL-47725 gradereport_user: Only hide grades when they were altered 
The method blank_hidden_total_and_adjust_bounds() now checks for more
than just a grade change, and in that cause would hide the grade. We
added a condition to only hide the grade when it effectively changed,
not when its other properties have.
 2014-10-20 14:19:02 +08:00
Marina Glancy
b3729c99aa Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle 2014-10-20 14:08:06 +08:00