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

19169 commits

Author SHA1 Message Date
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
Sam Hemelryk
70b370982f Merge branch 'MDL-47476' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-10-08 11:02:38 +13:00
Sam Hemelryk
93fad868d9 Revert "MDL-46978 gradebook: Edit grade item changes visibility of category" 
This reverts commit bad2c9b14f.
 2014-10-08 10:37:12 +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
08abbd61c2 Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 09:24:39 +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
Sam Hemelryk
94cdabcdee Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 16:28:50 +13: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
Andrew Nicols
776b4acc81 MDL-46284 core: Add e-mail fetcher from IMAP 
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
Andrew Nicols
77c0a68db9 MDL-46284 core: Add e-mail fetcher from IMAP 
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-07 09:58:35 +08:00
Sam Hemelryk
f46606936a Merge branch 'MDL-46978' of https://github.com/danielneis/moodle 2014-10-07 10:26:05 +13:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle 
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
 2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
Marina Glancy
b79d2e2c08 Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle 2014-10-06 20:40:13 +08:00
Marina Glancy
e286185334 Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:38:29 +08:00
Petr Skoda
ddffa9d6d3 MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant 2014-10-06 17:31:15 +13:00
Sam Hemelryk
127ef54082 Merge branch 'MDL-45374' of git://github.com/jleyva/moodle 2014-10-06 10:44:30 +13:00
Dan Poltawski
16078807f8 MDL-47221 task: allow 'random' time definitions 
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.

This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.

Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
 2014-10-05 14:27:04 +01:00
Juan Leyva
6ff4464b43 MDL-45374 messages: get_messages ws unit tests 2014-10-03 16:37:13 +02:00
Juan Leyva
aff9da176a MDL-45374 messages: get_messages ws definition 2014-10-03 16:37:12 +02:00
Marina Glancy
58b5b04d4b MDL-35618 enrol_cohort: remove enrolment button 2014-10-03 18:28:48 +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
Adrian Greeve
102c1c3671 MDL-46576 core_grades: Update upgrade scripts new version number 2014-10-03 17:06:42 +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
Jetha Chan
6da0e4cfff MDL-45893 user_menu: based on action_menu, new responsive approach 2014-10-03 15:12:59 +08:00
Marina Glancy
97329f1bc1 MDL-47492 behat: refer to table column indexes instead of names 2014-10-03 13:55:25 +08:00
Frederic Massart
0b2e8ae07b MDL-47430 core_grades: Handle negative grademin with natural weighting 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
11c93e286b MDL-47110 Grades: Get the autoupdateweight behat tests to pass. 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
e61f25a4f8 MDL-47110 Grades: Change how updated weights notifications are detected. 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Adrian Greeve
f70da024c8 MDL-47110 core_grades: Update to auto_adjust_weights 
Part of: MDL-46576
 2014-10-03 13:55:24 +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
Frederic Massart
64055d50bc MDL-47377 core_grades: Handle items with a weight of 0 
They do not contribute to the category/course total any more.

Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
c529f4b30f MDL-47420 Grades: Get unit tests passing on natural grading branch 
Part of: MDL-46576
 2014-10-03 13:55:24 +08:00
Damyon Wiese
6077a4d43b MDL-47064 Grades: Final fix - set the grademax from the item, not the cat 
Part of: MDL-46576
 2014-10-03 13:55:23 +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
6070e53313 MDL-47064 Grades: Add comments to explain this tricky code. 
Part of: MDL-46576
 2014-10-03 13:55:23 +08:00
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