mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
70,301 Commits 36 Branches 519 Tags
Commit Graph

12178 Commits

Author SHA1 Message Date
Frederic Massart
09171b955e MDL-38732 gradereport_grader: Handle simultaneous graders 2014-10-14 13:52:42 +08:00
Sam Hemelryk
9ff13804e5 Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-09 08:51:40 +13:00
Dan Poltawski
66689366a0 Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
 2014-10-08 15:49:58 +01:00
Dan Poltawski
da88accb5f Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle 2014-10-08 15:33:46 +01:00
Dan Poltawski
e462093201 Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/grade.less
	theme/bootstrapbase/style/moodle.css
 2014-10-08 10:26:13 +01:00
Marina Glancy
eb84b77923 MDL-47543 core_grades: improve navigation menu in grade administration 2014-10-08 15:03:36 +08:00
Frederic Massart
70e7b634e4 MDL-46481 backup: Reposition one-click backup button 2014-10-08 13:45:24 +08:00
Mark Nelson
3419a38980 MDL-40697 core_grades: changed user_graded event name 2014-10-07 19:04:10 -07:00
Mark Nelson
b0f844388b MDL-40697 core: added grade_deleted event 2014-10-07 19:04:09 -07:00
Sam Hemelryk
c709fafc6e Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-08 11:16:54 +13:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 16:52:07 +01:00
Jetha Chan
854a647e62 MDL-45893 user_menu: responsive approach; fixed minor issues 2014-10-07 23:31:47 +08:00
Dan Poltawski
c31f7c58c1 Merge branch '46481-28' of git://github.com/samhemelryk/moodle 2014-10-07 14:25:06 +01:00
Damyon Wiese
4a813f3959 Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 12:34:34 +08:00
Andrew Nicols
27f7487f82 MDL-47197 core: Private files handler 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-07 10:01:19 +08:00
Adrian Greeve
b0147a652c MDL-46547 gradebook: Moving gradebook csv import into a class. 
This allows plugins such as drag and drop to use / extend the class
and saves on duplicating code.
 2014-10-06 09:14:04 +08:00
Sam Hemelryk
3973b67f61 MDL-46481 backup: removed collapsing and better lang string 
Thanks Rex for the peer-review!
 2014-10-05 16:21:38 +13:00
Marina Glancy
fbb250f8ef MDL-36014 cohorts: Support cohort visibility in Upload cohorts 2014-10-03 18:26:37 +08:00
Marina Glancy
80f98467f8 MDL-36014 cohorts: Allow teachers to view cohorts 
Added property 'visible' for cohorts. Unsetting it hides the cohort from users in the course.

AMOS BEGIN
 CPY [visible,core_moodle],[visible,core_cohort]
AMOS END
 2014-10-03 18:26:34 +08:00
Marina Glancy
78fb7110e0 MDL-36014 cohorts: fix string names 
Cohort capabilities are defined in lang/en/roles.php, remove(rename) the capability-styled strings

AMOS BEGIN
 CPY [cohort:assign,core_assign],[assigncohorts,core_assign]
AMOS END
 2014-10-03 17:56:22 +08:00
Damyon Wiese
a9937aec06 MDL-47062 Grades: Add an upgrade step to warn about changes in upgrade. 
Puts a notice on the grader report about the change in aggregation method
from "Sum of grades" to "Natural".

Part of: MDL-46576
 2014-10-03 17:06:41 +08:00
Andrew Nicols
8c037a917b MDL-46663 gradereport_grader: Remove fixed column support 
This issue is a part of the MDL-46658 Task.
This issue is a part of the MDL-25544 Epic.
 2014-10-03 15:43:19 +08:00
Adrian Greeve
519429b24f MDL-47110 core_grades: Normalisation of grade weights. 
This includes behat tests for this change.

Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
ee07a54be0 MDL-47064 Grades: Peer review cleanups 
Changes include:
 * Search for existing items to reduce DB queries in grade_category::aggregate_grades
 * Comments improvements
 * Move brackets to be part of lang string
 * Convert aggregationhints to be a class variable instead of passing it around

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
Frederic Massart
b0c91d7271 MDL-47146 core_grades: Improve labels of the fields on setup screen 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Frederic Massart
6c37563e00 MDL-47146 core_grades: Use a checkbox to override weights 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
bfc8c1d4d6 MDL-47146 core_grades: change columns on setup page 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Marina Glancy
8faa560ca9 MDL-47146 core_grades: merge simple and full view in setup 
Part of: MDL-46576
 2014-10-03 13:54:38 +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
Frederic Massart
ae93f35317 MDL-46827 core_grades: Allow reset of weights on categories 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
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
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
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
2e19f5e8e7 MDL-46139 Grades: Language change "weight -> calculated weight" 2014-10-03 13:47:41 +08:00
Sam Hemelryk
f3973676e8 MDL-46481 backup: implemented quick backup process (one click) 2014-10-03 09:43:08 +13: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 dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-10-01 08:58:22 +01:00
Eloy Lafuente (stronk7)
ed3e85755c Merge branch '47428-28' of git://github.com/samhemelryk/moodle 2014-09-30 23:42:58 +02:00
Dan Poltawski
d62f99195a Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-30 09:55:03 +01:00
Dan Poltawski
d452f49cf9 Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle 2014-09-30 08:29:02 +01:00
Dan Poltawski
190ceae64b Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle 2014-09-29 12:46:11 +01:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-29 10:30:42 +01:00
Brian Barnes
11edf09c61 MDL-46127 core_calendar: Removed tables when rendering a single event 2014-09-29 10:45:39 +13:00
Dave Cooper
e89682d822 MDL-32275 enrol: Last site access column now shows last course access 2014-09-26 10:51:47 +08:00
Andrew Davis
0e99979638 MDL-20250 core_grade: added some settings to disable or hide gradebook functionality 2014-09-26 10:19:00 +08:00
Sam Hemelryk
3a6ef60a5b MDL-47428 language: fixed typo 2014-09-26 10:05:24 +12:00