mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 01:20:27 +01:00
Code Issues Projects Releases Wiki Activity
69,449 Commits 36 Branches 527 Tags
Commit Graph

1695 Commits

Author SHA1 Message Date
Marina Glancy
c86ae8660c Merge branch 'MDL-46846-master' of git://github.com/damyon/moodle 2014-08-19 14:20:31 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Frederic Massart
abbee05eb3 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:47:34 +08:00
Rajesh Taneja
641459a8a5 MDL-46817 behat: Step to check if value exist/not in table column 2014-08-18 09:59:29 +08:00
Damyon Wiese
924cb72b4a MDL-46846 Grades export: Some settings were not parsed from the form correctly. 
This was a regression from MDL-46548.

I also added to the behat test to cover this, and sped up the behat test while I was there.

I also restored the behaviour where usercustomfields was hardcoded to true for all
export types except XML - but the default was false.
 2014-08-15 13:53:29 +08:00
Marina Glancy
38a5c6861e Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle 2014-08-13 09:25:38 +08:00
Eloy Lafuente (stronk7)
179eb9cabd Merge branch 'MDL-46697' of git://github.com/aolley/moodle 2014-08-13 02:08:07 +02:00
Mark Nelson
67ab0ff089 MDL-46565 gradereport_*: moved report viewed event to bottom of page 2014-08-12 12:27:50 -07:00
Mark Nelson
44263d9c1c MDL-46565 gradereport_*: renamed event string names 
This makes the strings more descriptive and consistent.

AMOS START
  MOV [eventreportviewed, gradereport_grader],[eventgradereportviewed, gradereport_grader]
  MOV [eventreportviewed, gradereport_outcomes],[eventgradereportviewed, gradereport_outcomes]
  MOV [eventreportviewed, gradereport_overview],[eventgradereportviewed, gradereport_overview]
  MOV [eventreportviewed, gradereport_user],[eventgradereportviewed, gradereport_user]
AMOS END
 2014-08-12 12:19:18 -07:00
Dan Poltawski
134b1e4c90 Merge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-12 11:06:53 +01:00
Marina Glancy
e12ffe254e Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle 2014-08-12 15:01:19 +08:00
Marina Glancy
44c2bafc1f Merge branch 'MDL-46646-master' of git://github.com/andrewnicols/moodle 2014-08-12 13:32:33 +08:00
Marina Glancy
36e2b86dd3 Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle 2014-08-12 13:29:15 +08:00
Andrew Nicols
b21b32a4af MDL-46646 gradebook: Optimise generation of the grader report table 
The grader report table makes use of various user preferences, and strings
which on every iteration. On a large gradebook, this can have a significant
impact upon performance.
The table also uses html_writer::tag to generate spans for
machine-generated content which becomes expensive on larger gradebooks.
 2014-08-12 11:56:42 +08:00
Mary Evans
6f0bab6888 MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades. 2014-08-11 23:40:46 +01:00
Andrew Davis
93dbb21841 MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:15:00 +08:00
Dan Poltawski
0bd41a9ccf Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle 2014-08-11 10:41:40 +01:00
Damyon Wiese
5232d3f2c9 MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved. 2014-08-11 15:53:47 +08:00
Damyon Wiese
d2e9fc5845 MDL-35984 grade: Add behat tests for grade aggregations 2014-08-11 15:53:41 +08:00
Marina Glancy
9fe5a1b8f4 MDL-30668 gradereport_grader: split user preferences into individual courses 
This solves the DB exception when users were trying to insert very large string in DB
 2014-08-08 15:13:58 +08:00
Rajesh Taneja
cc41342290 MDL-46175 behat: Fixed lang changes in gradebook 2014-08-07 09:39:58 +08:00
Adam Olley
780d42d0c6 MDL-46697 gradebook: Only count active users when needed (and only id) 
The code only needs the id column to perform its count. On courses with a lot of users
fetching the whole user record for them all easily adds up to several hundred MB of
memory.
 2014-08-06 16:02:08 +09:30
Andrew Davis
23a62c47af MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported. 2014-08-06 10:58:59 +08:00
Mark Nelson
87f860cdd4 MDL-46565 gradereport_*: renamed report classes to match parent 2014-08-05 19:52:45 -07:00
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Damyon Wiese
9871a438f8 MDL-46548 grades: Reorder grade export form. 
Move the list of grade items to the top, and leave them expanded by default.

Move the idnumber warning into the grade items section, now it is visible by default.
 2014-08-04 16:24:47 +08:00
Damyon Wiese
8d395db4c3 MDL-46548 grades: Add upgrade.txt for gradeexport plugins 2014-08-04 16:18:33 +08:00
Damyon Wiese
8cd07ed02a MDL-46548 grades: Remove file upload tags 2014-08-04 16:18:32 +08:00
Damyon Wiese
8023a71b9a MDL-46548 grades: Add behat test for xml export 2014-08-04 16:18:32 +08:00
Damyon Wiese
26b0c96f5b MDL-46548 grades: Add behat test for csv export 2014-08-04 16:18:32 +08:00
Damyon Wiese
ad5ab383e6 MDL-46548 behat: Prevent force file save as for some pages we want to test with behat. 2014-08-04 16:18:32 +08:00
Damyon Wiese
6c6d05a651 MDL-46548 grades: Add warning to export form when users with no idnumber are excluded. 2014-08-04 16:18:25 +08:00
Andrew Davis
e54e51931d MDL-46175 core_grading: updated grading related strings 2014-08-01 10:28:57 +08:00
Damyon Wiese
97908a2225 MDL-46548 grades: Update xml grade export to support one step exports. 2014-07-31 17:00:14 +08:00
Damyon Wiese
9f5834ccc7 MDL-46548 grades: Update xls grade exporter to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
1cc43058a8 MDL-46548 grades: Update ods grade export to support one step exports. 2014-07-31 17:00:08 +08:00
Damyon Wiese
cca51baa07 MDL-46548 grades: Add support for simplified one-step exports and update txt exporter 
This ui change requires changes to the API so I have deprecated the old functions while maintaining
compatibility (if you don't mind lots of debugging).
 2014-07-31 17:00:01 +08:00
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