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

19738 commits

Author SHA1 Message Date
Damyon Wiese
852fae0b71 MDL-47064 Grades: Fix contribution column for other types of aggregation 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Damyon Wiese
53771c404f MDL-47064 Grades: Fix the contributed weights column for students and teachers. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
Marina Glancy
b79bf7a234 MDL-47146 core_grades: Removed unused setup columns 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Frederic Massart
e8e1d0a396 MDL-47255 core_grades: Save aggregationcoef2 and weightoverride in history 
Part of: MDL-46576
 2014-10-03 13:54:38 +08:00
John Okely
61e521bb09 MDL-47006 core_grades: Add weightoverride to qualifies_for_regrading 
Part of MDL-46576
 2014-10-03 13:54:07 +08:00
John Okely
d32b293eac MDL-46576 core_grades: MDL-47006 Change aggregationcoef2's comment 2014-10-03 13:54:07 +08:00
John Okely
b6a1e366a7 MDL-46576 core_grades: MDL-47006 Refactor weightings code for readibility 2014-10-03 13:54:07 +08:00
Frederic Massart
ded8ea8fd1 MDL-46824 core_grades: Only display 'Drop n lowest' when supported 
Part of: MDL-46576
 2014-10-03 13:54:07 +08:00
Frederic Massart
4272386a7d MDL-46824 core_grades: Control when drop lowest/keep highest is allowed 
Part of: MDL-46576
 2014-10-03 13:54:06 +08:00
Adrian Greeve
dcfc196a0d MDL-47256 gradebook: Fixed up split in new field upgrade script. 
Part of: MDL-46576
 2014-10-03 13:54:06 +08:00
Frederic Massart
ef1b3e56f7 MDL-47345 core_grades: Pre-regrade method is executed from children to parent 
Part of: MDL-46576
 2014-10-03 13:53:02 +08:00
Damyon Wiese
90cc8ce7c4 MDL-47059 Grades: Update the grade_grade if the finalgrade/or the grademax has changed. 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
1577229f93 MDL-47059 Grades: Make natural weights work with extra credit 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
057063b1e6 MDL-47059 Grades: Make natural weights work with exclude empty grades 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
5a59aeb14e MDL-47078 Grades: Allow users to have different max grades due to exclusions etc. 
This is about making this work with natural weightings.

Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Damyon Wiese
a2c13f686a MDL-47009 Grades: Improve natural weighting algorithm 
It's still not perfect, but this is getting closer.

This is based on Johns work on MDL-47009 (just the algorithm). There are some additional
changes to scale the weights if they do not add up to 1.

Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Frederic Massart
825fba1c5b MDL-47274 core_grades: Correct totals when excluding hidden items 
Part of: MDL-46576
 2014-10-03 13:53:01 +08:00
Frederic Massart
fcf6e01517 MDL-47056 core_grades: Prevent items being displayed as 'Error' 
Before this patch we would be marking some items as 'needsupdate'
during an update. Leaving them aside and not effectively updating
them.

Part of: MDL-46576
 2014-10-03 13:51:30 +08:00
Andrew Davis
b14c5870fb MDL-47055 core_grade: implemented support for extra credit within natural weighting 2014-10-03 13:51:29 +08:00
John Okely
d57ea5996d MDL-46576 core_grade: Simplify code, remove obsolete calculations 2014-10-03 13:51:29 +08:00
John Okely
11eca362e2 MDL-46576: Fix natural weight maximums aggregation (MDL-47009) 2014-10-03 13:51:29 +08:00
John Okely
aa7055290e MDL-46576: Update reports so that they display natural weights properly (MDL-47009) 2014-10-03 13:51:29 +08:00
Andrew Davis
64b03e5bd7 MDL-47011 core_grade: added ability to un-override grade_item weight 2014-10-03 13:49:41 +08:00
Andrew Davis
45da536113 MDL-47011 core_grade: added the ability to override grade_item weight 2014-10-03 13:49:41 +08:00
Andrew Davis
a2f1f65db4 MDL-47011 core_grade: added naive natural weight calculation to gradebook 2014-10-03 13:49:22 +08:00
John Okely
677bc07377 MDL-46576 core_grades: Add weights to natural (MDL-47006) 2014-10-03 13:49:22 +08:00
John Okely
b5e00814b3 MDL-46576 code_grade: Rename "Sum of grades" aggregation to "Natural" 2014-10-03 13:48:55 +08:00
Damyon Wiese
a1740d7b48 MDL-46139 Grades: Change usedinaggregation column to 2 columns for status and weight. 2014-10-03 13:48:55 +08:00
Damyon Wiese
dadc9d991d MDL-46139 Grades: Add contibution to course total column to user report 2014-10-03 13:47:42 +08:00
Damyon Wiese
65c2ac9334 MDL-46139 Grades: Show the aggregation details in the user report. 2014-10-03 13:47:42 +08:00
Damyon Wiese
bfe969e8b3 MDL-46139 Grades: Add a column to grade_grades to record how a grade is aggregated 2014-10-03 13:47:42 +08:00
Tim Hunt
a75fa4c068 MDL-47476 qformat_learnwise: rest in peace. 
Learnwise was an old LMS that no longer exists. (Last reference found on
Google from 2009.) So we are removing the ability to import questions in
that format.
 2014-10-02 17:16:16 +01:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski
2e8101f6e6 Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle 2014-10-02 09:35:30 +01:00
Sam Hemelryk
454034351b Revert "MDL-47395 added cli_error() visual cue" 
This reverts commit eb60c78c77.
 2014-10-02 17:39:49 +13:00
Andrew Nicols
390485058e MDL-46282 core: Correct deletion of message datakeys 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-02 11:50:34 +08:00
Frederic Massart
776f66d8e0 MDL-47298 libraries: Update password_compat to latest version 2014-10-01 17:03:29 +08:00
Dan Poltawski
76e348d46d Revert "MDL-45893 user_menu: revised based on action_menu" 
Was not yet ready for the prime time.

This reverts commit dc4bff329d.
This reverts commit a535004e5c.
This reverts commit c8398fb95a.
This reverts commit d24b8e52d3.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-10-01 08:58:22 +01:00
Dan Poltawski
f2a8ecfae9 Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle 2014-10-01 08:37:43 +01:00
Andrew Nicols
84b02e6efd MDL-47214 core: IPs should be cleaned 2014-10-01 15:27:53 +08:00
Adam Olley
8180281b73 MDL-47484 atto_indent: Prevent loss of rangy markers in some cases 2014-10-01 13:53:23 +09:30
Sam Hemelryk
db89450d85 Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-10-01 15:37:56 +13:00
Dan Marsden
9528f643d1 MDL-47404 filelib: Prevent flash from treating files as uploads 
added to send_stored_file as well.
 2014-10-01 15:05:56 +13:00
Petr Skoda
366372c74e MDL-47477 libraries: use smoothness theme for jquery ui 2014-10-01 09:06:01 +13:00
Petr Skoda
5a53b77f71 MDL-47303 libraries: import latest jQuery library and friends 2014-10-01 09:04:20 +13:00
Sam Hemelryk
db34f8cbdb Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2014-10-01 08:57:37 +13:00
zbdd
77218e4a52 MDL-42993 auth: spaces removed from usernames by default only 
Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.
 2014-10-01 08:24:54 +13:00
Dan Poltawski
a96e90e1c0 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 17:30:20 +01:00
Damyon Wiese
0cc1ee1f30 MDL-46171 dml: DML unit test for tricky SQL in assign upgrade 
This tests a workaround for set_field_select where the set table and from table are the same.
 2014-09-30 23:35:37 +08:00
Dan Poltawski
8f97a5c66a Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle 2014-09-30 11:41:37 +01:00