David Monllao
94f73fdbcc
MDL-50283 gradeform_rubric: No need to escape HTML entities
2015-06-24 11:21:56 +08:00
Dan Poltawski
782300f3a8
Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle
2015-06-23 12:37:05 +01:00
Dan Poltawski
20a16512ee
Merge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle
2015-06-23 11:20:08 +01:00
Marina Glancy
46267b7b25
MDL-49257 grades: behat tests for extra credit
2015-06-23 14:25:50 +08:00
Marina Glancy
deb3d5ed00
MDL-49257 grades: introduce calculation freeze
...
In order to prevent changes in the existing grades when we fix bugs
we are introducing the gradebook code versioning. Each course may
"freeze" the code version to the older date. Freezing is usually done
during upgrade or restore and can be removed by the teacher by pressing
the button and accepting potential grade changes. There is no visible
setting and not possible to change the version back manually.
See MDL-50432 and MDL-50522
2015-06-23 14:25:47 +08:00
Eloy Lafuente (stronk7)
cd1d7c2993
Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle
2015-06-22 19:58:53 +02:00
Eric Merrill
394ade5f2b
MDL-50089 grades: Use grade item min/max in exports
2015-06-22 12:58:40 -04:00
Dan Poltawski
bf6395107b
Merge branch 'MDL-50091' of git://github.com/timhunt/moodle
2015-06-22 12:06:49 +01:00
Davo Smith
556e33d77c
MDL-49176 gradingform_guide: display newline characters as <br> tags
2015-06-22 10:13:18 +01:00
Tim Hunt
1c733bd604
MDL-50648 grader report: columns misaligned with some permissions
...
If a user can see the grader report and singleview report, but not
the user report ($CFG->grade_profilereport) then the colspans
were wrong and so the columns did not line up under the right headers.
2015-06-19 12:35:54 +01:00
David Monllao
a939ae6da7
MDL-50283 gradingform_rubric: Minor styling fixes
2015-06-19 12:44:07 +08:00
Syxton
e22c8d2ae3
MDL-50283 rubric: Add duplicate row button
...
Adds the ability to duplicate a row in a rubric.
2015-06-19 12:00:23 +08:00
Rajesh Taneja
77f1778c40
MDL-50481 core_grades: Fixed behat feature and step to work with non-js
...
xPath used in step is not using proper oring
and fails with goutee driver. Also, feature don't
really need to be executed in js, so setting that
as non-js
2015-06-19 12:00:11 +08:00
Tim Hunt
2ebeeeaf0a
MDL-50091 grade singleview: use standard API to build the link
...
Acutally the necessary code was already there. There was just some
unnecessary code that was added with the issue number MDL-47746. I have
just stripped out the unused code, which fixes the bug where a missing
activity caused a fatal error.
2015-06-17 13:46:04 +01:00
David Monllao
12a4770d9b
MDL-48618 grades: Testing calculated items with minmaxtouse
2015-06-12 13:19:04 +08:00
Frederic Massart
597fc6db1a
MDL-48618 grades: Behat tests to cover min/max grade changes
...
The values provided as part of this test are similar to values
that can be found in 2.7. This is to ensure that users will not
experience changes in grades.
2015-06-10 12:33:42 +08:00
Frederic Massart
ebea19cb26
MDL-48618 grades: Handling of inconsistencies due to min/max grades
2015-06-10 12:33:41 +08:00
Eric Merrill
c07775dfff
MDL-48618 gradebook: Only use individual min/max for aggrigate grades
2015-06-05 17:05:24 +08:00
jinhofer
59f7fd42e0
MDL-50140 grade/import: Fix for misplaced CSH buttons
2015-06-03 15:44:28 +01:00
jinhofer
0fa9b33463
MDL-50140 grade/import: Added CSH buttons to import grades
...
CSH buttons have been added to CSV Import as well as Paste
from spreadsheet in the following areas:
Encoding, Separator (csv only), Verbose, Preview, Map to,
and Map from.
The heading of Import CSV had a CSH button added as well.
All CSH buttons were given associated language strings.
2015-05-28 07:51:50 -05:00
Damien Bezborodov
e604d38fc7
MDL-50285 gradereport_user: Grade categories calculate wrong with suspended users (Student's view)
2015-05-25 17:43:48 +08:00
Eloy Lafuente (stronk7)
4115105c2c
Merge branch 'MDL-50169' of https://github.com/sk-unikent/moodle
2015-05-19 02:03:07 +02:00
Dan Poltawski
04d73f4fff
Merge branch 'MDL-49949-master' of git://github.com/mastnym/moodle
2015-05-18 15:32:56 +01:00
jinhofer
75a548b5f3
MDL-49764 grade/report/grader: Fixed height issue for IE
2015-05-18 07:47:54 -05:00
Martin Mastny
1be1c66a9b
MDL-49949 grader: Using method to determine item name
2015-05-15 14:58:00 +08:00
Skylar Kelty
6e60e99570
MDL-50169: Fix grade report SQL logic
2015-05-12 08:03:56 +01:00
Eloy Lafuente (stronk7)
b758ab3053
MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts
2015-05-12 00:21:05 +02:00
Eloy Lafuente (stronk7)
26ea380d24
MDL-50102 versions: bump all versions and requires near release
...
version = planned 2015051100 release version
requires= current 2015050500 rc1 version
Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
John Okely
4887d15228
MDL-49983 navigation: Remove 'my' from user context navigation
2015-05-04 12:38:50 +08:00
David Monllao
d567320928
Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
2015-04-30 14:53:52 +08:00
Martin Mastny
5c3b5143dc
MDL-49281 grades: Calculation settings upgraded
2015-04-30 13:42:19 +08:00
Andrew Nicols
2fac3c3c5f
Merge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle
2015-04-29 12:18:52 +08:00
Andrew Nicols
1c193d49f0
Merge branch 'MDL-49926-master' of git://github.com/mastnym/moodle
2015-04-28 10:11:16 +01:00
Adrian Greeve
12261113a9
MDL-49888 navigation: Added missing reports to user profile.
...
Added statistics and grade to the reports section in the user
profile.
2015-04-28 14:30:26 +08:00
Martin Mastny
1af4cced98
MDL-49926 gradereport: Feedback gets saved when editing grade in ajax mode
2015-04-24 13:16:07 +08:00
Simey Lameze
e35bac3e80
MDL-49854 core: User navigation refinements
...
Fixing some reported issues:
- Removing unnecessary conditional include
- Require login in grade/report/mygrades.php
- Remove unnecessary defined('MOODLE_INTERNAL') call
- Fixing context_header::__construct $imagedata param type
2015-04-21 11:46:32 +08:00
Rajesh Taneja
0fe86bbdbb
MDL-49799 behat: replaced asd.com with example.com
...
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Dan Poltawski
9697b3da0a
Merge branch 'MDL-49573-master' of git://github.com/gurgus/moodle
2015-04-16 16:08:22 +01:00
David Monllao
89a6290fb9
Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle
2015-04-16 17:04:34 +08:00
Juan Leyva
82fc915f08
MDL-45131 grades: Add validation for returned parameters in WS tests
2015-04-16 10:25:34 +02:00
Dave Cooper
56913501a9
MDL-49573 gradereport_singleview: Add tests for bulk grade inserts
2015-04-16 13:03:10 +08:00
Dave Cooper
bd1537b64c
MDL-49573 gradereport_singleview: Fixed bulk insert override logic.
2015-04-16 13:01:15 +08:00
Frederic Massart
09235e249e
MDL-49741 core_grades: Restore correct padding on Setup screen
2015-04-15 12:16:56 +08:00
Dan Poltawski
0627d5802c
Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle
2015-04-14 15:32:13 +08:00
Adrian Greeve
6e918b6437
MDL-45774 navigation: General fixes for the user navigation.
2015-04-13 15:54:24 +08:00
Damyon Wiese
46a2fbc4b7
MDL-49412 Navigation: Remaining behat fixed for nav branch
...
Behat is passing after this change.
Part of MDL-45774.
2015-04-10 17:19:28 +08:00
John Okely
3a8b9b6583
MDL-49412 grades: Update grade unit tests with new navigation
...
Part of MDL-45774.
2015-04-10 17:18:23 +08:00
Adrian Greeve
0ef6c85115
MDL-49688 navigation: Update to overview report and my index.
...
Part of MDL-45774.
2015-04-10 17:17:32 +08:00
Adrian Greeve
c78dbe03fb
MDL-49634 navigation: My grades now relevant to teachers.
...
My grades was originally only showing grades to a student.
Now the report will also show teachers what courses they are
teachers in.
Part of MDL-45774.
2015-04-10 17:17:08 +08:00
Adrian Greeve
f495187da7
MDL-48935 navigation: Update the user nav breadcrumbs.
...
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
