mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity
71,178 Commits 36 Branches 527 Tags
Commit Graph

12203 Commits

Author SHA1 Message Date
Sam Hemelryk
32bc89811c MDL-36236 cache: clarified locking strings 
We copy the cachedef_locking string as that cache definition is
used for locking and its name is more than likely the descriptive
word we are looking for.

AMOS BEGIN
  CPY [cachedef_locking,cache],[locking,cache]
AMOS END
 2014-11-21 11:33:07 +13:00
Gilles-Philippe Leblanc
af14ef657a MDL-47501 gradebook: Add an indication that the grade letters was overridden 2014-11-18 17:13:40 +00:00
Helen Foster
ee7a1a546c MDL-47800 admin: improved strings 2014-11-18 16:35:38 +00:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Helen Foster
ed10b1d94d MDL-48214 Merge English strings from the en_fix language pack 2014-11-13 11:29:08 +01:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Tim Hunt
40459677a0 MDL-47797 question preview: show more technical info 
It is helpful for developers creating question types (at least) to be
able to see this.
 2014-10-31 15:52:54 +00:00
Marina Glancy
9e432c22cd Merge branch 'MDL-47909-master' of git://github.com/andrewnicols/moodle 2014-10-30 16:15:10 +08:00
Andrew Nicols
02cf3958d2 MDL-47909 mod_forum: Respect user autosubscribe setting on post 
Re-appropriate the forum autosubscribe setting as a discussion
autosubscribe setting.

The setting was no longer used after the per-discussion changes. The
original plan had been to remove this setting, but there is some benefit to
respecting it for discussion subscriptions instead.
 2014-10-30 13:36:06 +08:00
Petr Skoda
5aaac8b2d6 MDL-40949 admin: Fix $CFG->preventexecpath hints 
This setting restricts all local paths, not just
executables.
 2014-10-29 10:45:44 +13:00
Jetha Chan
b865a3e2d1 MDL-47559 user_menu: customusermenu setting 2014-10-27 20:04:45 +08:00
Marina Glancy
079b2e5202 MDL-47542 core_grades: action menu for grade setup 2014-10-24 11:49:19 +02:00
Dan Poltawski
3456ac3ba0 Merge branch '47684-28' of git://github.com/samhemelryk/moodle 2014-10-24 11:48:16 +02:00
Damyon Wiese
47d6e6a7d3 MDL-47503 Grades: Completely remove aggregationsubcats 
This setting is not compatible with combinations of aggregation methods
and the ways in which it does and does not work are not documented. It
was voted to remove it completely by the gradebook workshop, so I have
completely removed it and added a warning for all affected courses + restored
backups.
 2014-10-20 12:03:18 +08:00
Sam Hemelryk
d28e0a2f76 MDL-47684 mod: better validation of rating options 2014-10-20 08:44:35 +13:00
Dan Poltawski
f6aaa184ab Revert "MDL-47684 mod: better validation of rating options" 
This reverts commit 8028df293a4f024a954dc12ed4e6cb5161c951b0.
 2014-10-17 14:27:49 +01:00
Dan Poltawski
e2270952c5 Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle 2014-10-16 17:30:27 +01:00
Dan Poltawski
d65eefdbf1 Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle 2014-10-16 13:44:48 +01:00
Adrian Greeve
b9cafe3b40 MDL-46599 gradebook: Added a time exported column to grade export via csv. 
This will be useful for checking if a csv import is trying to overwrite
new grade updates.
 2014-10-16 10:31:10 +08:00
Simey Lameze
a5240a82a6 MDL-46599 gradebook: Add force import option on CSV file and direct importing 2014-10-16 10:22:45 +08:00
Sam Hemelryk
8028df293a MDL-47684 mod: better validation of rating options 2014-10-16 14:50:56 +13:00
Dan Poltawski
33ccfc1f13 Merge branch 'MDL-47560-master' of git://github.com/gurgus/moodle 2014-10-15 16:56:43 +01:00
Dave Cooper
c8eb1fae64 MDL-47560 Grades: Unset config when gradebook upgrade acknowledged. 2014-10-15 11:00:57 +08:00
Frederic Massart
09171b955e MDL-38732 gradereport_grader: Handle simultaneous graders 2014-10-14 13:52:42 +08:00
Zachary Durber
92c61fee64 MDL-18229 gradebook: Links to Single view via icons on Grade Report. 2014-10-14 10:26:45 +08:00
Zachary Durber
4229e9fa8d MDL-18229 gradebook: Added filter icons for activities and users. 
Corrected CSS for grades column, was far too large.
 2014-10-14 10:26:45 +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