69130 Commits

Author SHA1 Message Date
Marina Glancy
274dc06881 MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page 2014-07-28 15:02:27 +08:00
Marina Glancy
5f079af450 MDL-46503 behat: cohort generator allows to create cohort in category 2014-07-25 09:12:21 +08:00
Dan Poltawski
40f0ad21a3 weekly release 2.8dev 2014-07-24 09:50:52 +01:00
Dan Poltawski
25f0ec805c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-24 09:50:49 +01:00
Damyon Wiese
3169bb36aa MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup 2014-07-24 10:50:20 +08:00
AMOS bot
8db9324914 Automatically generated installer lang files 2014-07-23 22:46:06 +00:00
Dan Poltawski
a3fa656019 Revert "Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle"
This reverts commit fe43ab9b75a6f78f86525be8b309e66c162b2957, reversing
changes made to 3e2af223273fcd008a136c15a587475f5b04081b.
2014-07-23 09:00:54 +01:00
Dan Poltawski
1911cf3c99 Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle 2014-07-23 08:24:24 +01:00
Damyon Wiese
6b78b55c15 MDL-35864 Enrol plugins: Add missing capability strings 2014-07-23 13:53:55 +08:00
Sam Hemelryk
ed2de2ecc7 MDL-45724 cache: fixed warning structure bug 2014-07-23 15:24:59 +12:00
AMOS bot
aec0035b11 Automatically generated installer lang files 2014-07-22 22:49:02 +00:00
Dan Poltawski
919dc292b9 MDL-45965 assign: bump version 2014-07-22 17:23:45 +01:00
Dan Poltawski
406e47123d Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle 2014-07-22 17:09:48 +01:00
Dan Poltawski
fce6c70d41 MDL-44925 fixup default settings in TeX filter 2014-07-22 17:06:02 +01:00
Dan Poltawski
82f88cabe9 MDL-35864 enrol: misc fixups
* Removed get_config_instance_capabilities() which was from
  older reviewed vrsions of the patch
* Added note to upgrade.txt
* Fixed deprecation note
* Bump versions
2014-07-22 17:02:21 +01:00
Dan Poltawski
12bdea2eb5 Merge branch 'MDL-35864' of https://github.com/danielneis/moodle 2014-07-22 16:32:26 +01:00
Dan Poltawski
02213adfd0 Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle 2014-07-22 15:56:55 +01:00
Dan Poltawski
afffcb9472 Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle 2014-07-22 14:33:33 +01:00
Dan Poltawski
6442e5c7ed Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle 2014-07-22 12:01:04 +01:00
Dan Poltawski
5f7ab6e949 Merge branch '45828-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:33:01 +01:00
Dan Poltawski
d28d270bca Merge branch '45724-28' of git://github.com/samhemelryk/moodle 2014-07-22 09:07:16 +01:00
Sam Hemelryk
fe43ab9b75 Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle 2014-07-22 11:12:09 +12:00
Sam Hemelryk
3e2af22327 Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle 2014-07-22 09:49:03 +12:00
Dan Poltawski
6188c8ebab Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle 2014-07-21 14:11:39 +01:00
Eric Merrill
84f74ccff6 MDL-46386 question Whitelist the Atto editor from return blocking
Prevent the question engine from blocking return/enter key presses
from being sent to the Atto editor.
2014-07-21 09:08:01 -04:00
Dan Poltawski
c7075c0c91 MDL-46285 coding style fix
(no double newlines)
2014-07-21 14:07:39 +01:00
Dan Poltawski
f5fea4019a Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle 2014-07-21 14:03:58 +01:00
Dan Poltawski
992207f75e MDL-46316 notes: coding style fixes
Line length issues Andrew missed off.
2014-07-21 12:41:22 +01:00
Dan Poltawski
087e7d8fb1 Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle 2014-07-21 12:31:51 +01:00
Dan Poltawski
65f00f063b Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle 2014-07-21 12:09:10 +01:00
Dan Poltawski
724d7abe8b Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle 2014-07-21 10:20:55 +01:00
Dan Poltawski
1d3b11ec48 Merge branch '46335-28' of git://github.com/samhemelryk/moodle 2014-07-21 09:59:04 +01:00
Dan Poltawski
f9075a7888 Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle 2014-07-21 09:54:56 +01:00
Damyon Wiese
2fef6e7060 MDL-46017 Assign: Fix restore of marking workflow data 2014-07-21 16:35:30 +08:00
Damyon Wiese
ae7638f72a MDL-37509 Assign: Do not put description in calendar before it should be shown to students 2014-07-21 15:54:39 +08:00
Damyon Wiese
3b775a0b8a MDL-43151 Assign: More validation in mod_form.
Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on
2014-07-21 13:41:51 +08:00
Damyon Wiese
3db661cdae MDL-43151 assign: Use grade_grade->is_passed
Do not try and calculate this inside mod_assign - it's a gradebook thing only.
2014-07-21 13:22:22 +08:00
Simey Lameze
feff774adb MDL-43063 core: fix phpdoc comment codechecker issue. 2014-07-21 10:08:41 +08:00
Sam Hemelryk
584539c0fc MDL-42909 course: fixed whitespace 2014-07-21 11:42:52 +12:00
Sam Hemelryk
d90b055ab1 Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle 2014-07-21 11:35:47 +12:00
Sam Hemelryk
424033b780 Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle 2014-07-21 11:32:09 +12:00
Sam Hemelryk
ce3d7d5da9 Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-07-21 11:14:30 +12:00
Sam Hemelryk
365e80ba76 Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle 2014-07-21 11:12:05 +12:00
Sam Hemelryk
ce61d62c5e Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle 2014-07-21 10:55:08 +12:00
Sam Hemelryk
8d3a4d7597 Merge branch 'MDL-45339-master' of git://github.com/xow/moodle 2014-07-21 10:49:25 +12:00
Sam Hemelryk
69286e3b49 Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle 2014-07-21 10:45:33 +12:00
Sam Hemelryk
915140c9b5 MDL-45724 cache: added cache API warnings to the admin notifications page 2014-07-21 09:48:33 +12:00
Sam Hemelryk
6e247996ea MDL-45828 cache: definitions now sorted in the admin UI 2014-07-21 09:25:22 +12:00
AMOS bot
f61b21d6da Automatically generated installer lang files 2014-07-20 00:44:14 +00:00
AMOS bot
5aa771abd1 Automatically generated installer lang files 2014-07-19 00:41:42 +00:00