Dan Poltawski [Mon, 28 Jul 2014 11:49:13 +0000 (12:49 +0100)]
Merge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:47:30 +0000 (12:47 +0100)]
Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:01:24 +0000 (12:01 +0100)]
Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:59:02 +0000 (11:59 +0100)]
Merge branch 'MDL-46459' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:52:09 +0000 (11:52 +0100)]
Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:49:37 +0000 (11:49 +0100)]
Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:45:17 +0000 (10:45 +0100)]
Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:41:05 +0000 (10:41 +0100)]
Merge branch 'MDL-46397' of git://github.com/nobelium/moodle
Marina Glancy [Mon, 28 Jul 2014 08:00:48 +0000 (16:00 +0800)]
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
Jetha Chan [Fri, 25 Jul 2014 02:57:42 +0000 (10:57 +0800)]
MDL-46523 navigation: add body class when logged in as other role
Nobelium [Mon, 28 Jul 2014 05:37:21 +0000 (05:37 +0000)]
MDL-46397 mod_scorm : binding cmi values with scoid
Sam Hemelryk [Mon, 28 Jul 2014 01:25:13 +0000 (13:25 +1200)]
Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)]
Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)]
Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:13:44 +0000 (12:13 +1200)]
Merge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)]
Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:46:03 +0000 (08:46 +1200)]
Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:37:42 +0000 (08:37 +1200)]
Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle
Juan Leyva [Wed, 23 Jul 2014 15:33:20 +0000 (17:33 +0200)]
MDL-46459 Web Services: Incorrect return parameters get_grades external function
Damyon Wiese [Wed, 23 Jul 2014 05:32:11 +0000 (13:32 +0800)]
MDL-46485 Assign: Fix when submitting to a group assignment from the default group
Damyon Wiese [Wed, 23 Jul 2014 05:31:25 +0000 (13:31 +0800)]
MDL-46485 Assign: New unit test to show error with group submission
Marina Glancy [Fri, 25 Jul 2014 06:29:55 +0000 (14:29 +0800)]
MDL-46525 enrol_cohort: fix JS error
Frederic Massart [Wed, 2 Jul 2014 09:40:33 +0000 (17:40 +0800)]
MDL-8501 mod_forum: Behat test for neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 08:06:49 +0000 (16:06 +0800)]
MDL-8501 mod_forum: Adding links to navigate between discussions
Frederic Massart [Wed, 2 Jul 2014 04:34:28 +0000 (12:34 +0800)]
MDL-8501 mod_forum: Test coverage of neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 04:33:56 +0000 (12:33 +0800)]
MDL-8501 mod_forum: New function to retrieve discussion neighbours
Marina Glancy [Thu, 24 Jul 2014 02:03:36 +0000 (10:03 +0800)]
MDL-46503 behat: cohort generator allows to create cohort in category
Petr Skoda [Mon, 21 Jul 2014 06:21:54 +0000 (18:21 +1200)]
MDL-46449 fix username prompt in login block when authloginviaemail enabled
Dan Poltawski [Thu, 24 Jul 2014 08:50:52 +0000 (09:50 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 24 Jul 2014 08:50:49 +0000 (09:50 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Thu, 24 Jul 2014 03:25:22 +0000 (11:25 +0800)]
MDL-46506 Assign: fix php warning on grant extension page
This code was missed when the extensionduedate was moved to the userflags table.
David Monllao [Thu, 24 Jul 2014 03:15:36 +0000 (11:15 +0800)]
MDL-46504 libraries: Fixing typo
Damyon Wiese [Thu, 24 Jul 2014 02:50:20 +0000 (10:50 +0800)]
MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup
David Monllao [Mon, 14 Jul 2014 04:13:41 +0000 (12:13 +0800)]
MDL-43390 files: Only lock when locking is not prevented
AMOS bot [Wed, 23 Jul 2014 22:46:06 +0000 (22:46 +0000)]
Automatically generated installer lang files
Simey Lameze [Wed, 23 Jul 2014 06:54:10 +0000 (14:54 +0800)]
MDL-46433 blog: fix error message when creating an external blog
Dan Poltawski [Wed, 23 Jul 2014 08:00:54 +0000 (09:00 +0100)]
Revert "Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle"
This reverts commit
fe43ab9b75a6f78f86525be8b309e66c162b2957, reversing
changes made to
3e2af223273fcd008a136c15a587475f5b04081b.
Dan Poltawski [Wed, 23 Jul 2014 07:24:24 +0000 (08:24 +0100)]
Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle
Dan Marsden [Thu, 29 May 2014 07:12:00 +0000 (19:12 +1200)]
MDL-45715 assign: disable marking allocation if markingworkflow is not set.
Damyon Wiese [Wed, 23 Jul 2014 05:53:55 +0000 (13:53 +0800)]
MDL-35864 Enrol plugins: Add missing capability strings
Sam Hemelryk [Wed, 23 Jul 2014 03:16:20 +0000 (15:16 +1200)]
MDL-45724 cache: fixed warning structure bug
Andrew Davis [Mon, 21 Jul 2014 13:30:17 +0000 (21:30 +0800)]
MDL-46463 core_rss: coding style cleanup in /rss
AMOS bot [Tue, 22 Jul 2014 22:49:02 +0000 (22:49 +0000)]
Automatically generated installer lang files
Dan Poltawski [Tue, 22 Jul 2014 16:23:45 +0000 (17:23 +0100)]
MDL-45965 assign: bump version
Dan Poltawski [Tue, 22 Jul 2014 16:09:48 +0000 (17:09 +0100)]
Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle
Dan Poltawski [Tue, 22 Jul 2014 16:06:02 +0000 (17:06 +0100)]
MDL-44925 fixup default settings in TeX filter
Dan Poltawski [Tue, 22 Jul 2014 15:34:47 +0000 (16:34 +0100)]
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
Dan Poltawski [Tue, 22 Jul 2014 15:32:26 +0000 (16:32 +0100)]
Merge branch 'MDL-35864' of https://github.com/danielneis/moodle
Dan Poltawski [Tue, 22 Jul 2014 14:56:55 +0000 (15:56 +0100)]
Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 22 Jul 2014 13:33:33 +0000 (14:33 +0100)]
Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 22 Jul 2014 11:01:04 +0000 (12:01 +0100)]
Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:33:01 +0000 (09:33 +0100)]
Merge branch '45828-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:07:16 +0000 (09:07 +0100)]
Merge branch '45724-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 21 Jul 2014 23:12:09 +0000 (11:12 +1200)]
Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)]
Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 21 Jul 2014 13:11:39 +0000 (14:11 +0100)]
Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle
Eric Merrill [Wed, 16 Jul 2014 21:32:32 +0000 (17:32 -0400)]
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.
Dan Poltawski [Mon, 21 Jul 2014 13:07:39 +0000 (14:07 +0100)]
MDL-46285 coding style fix
(no double newlines)
Dan Poltawski [Mon, 21 Jul 2014 13:03:58 +0000 (14:03 +0100)]
Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:39:18 +0000 (12:39 +0100)]
MDL-46316 notes: coding style fixes
Line length issues Andrew missed off.
Dan Poltawski [Mon, 21 Jul 2014 11:31:51 +0000 (12:31 +0100)]
Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)]
Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle
Dan Poltawski [Mon, 21 Jul 2014 09:20:55 +0000 (10:20 +0100)]
Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 21 Jul 2014 08:59:04 +0000 (09:59 +0100)]
Merge branch '46335-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)]
Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle
Damyon Wiese [Wed, 18 Jun 2014 06:59:58 +0000 (14:59 +0800)]
MDL-46017 Assign: Fix restore of marking workflow data
Damyon Wiese [Mon, 21 Jul 2014 07:54:39 +0000 (15:54 +0800)]
MDL-37509 Assign: Do not put description in calendar before it should be shown to students
Damyon Wiese [Mon, 21 Jul 2014 07:01:54 +0000 (15:01 +0800)]
MDL-46207 Tasks: Do not run tasks if their component is disabled.
This can be overridden on a per task basis by implementing:
get_run_if_component_disabled() in the scheduled task.
Damyon Wiese [Mon, 21 Jul 2014 05:41:51 +0000 (13:41 +0800)]
MDL-43151 Assign: More validation in mod_form.
Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on
Damyon Wiese [Mon, 2 Dec 2013 05:29:38 +0000 (13:29 +0800)]
MDL-43151 assign: Use grade_grade->is_passed
Do not try and calculate this inside mod_assign - it's a gradebook thing only.
Simey Lameze [Mon, 14 Jul 2014 07:55:23 +0000 (15:55 +0800)]
MDL-43063 core: fix phpdoc comment codechecker issue.
Brian Barnes [Mon, 21 Jul 2014 01:59:34 +0000 (13:59 +1200)]
MDL-46431 javascript_notifications: changed dialogue headings to h3's
Sam Hemelryk [Sun, 20 Jul 2014 23:42:52 +0000 (11:42 +1200)]
MDL-42909 course: fixed whitespace
Sam Hemelryk [Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)]
Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:32:09 +0000 (11:32 +1200)]
Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:14:30 +0000 (11:14 +1200)]
Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)]
Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:55:08 +0000 (10:55 +1200)]
Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:49:25 +0000 (10:49 +1200)]
Merge branch 'MDL-45339-master' of git://github.com/xow/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:45:33 +0000 (10:45 +1200)]
Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle
Sam Hemelryk [Thu, 29 May 2014 23:41:48 +0000 (11:41 +1200)]
MDL-45724 cache: added cache API warnings to the admin notifications page
Sam Hemelryk [Mon, 9 Jun 2014 21:41:30 +0000 (09:41 +1200)]
MDL-45828 cache: definitions now sorted in the admin UI
AMOS bot [Sun, 20 Jul 2014 00:44:14 +0000 (00:44 +0000)]
Automatically generated installer lang files
AMOS bot [Sat, 19 Jul 2014 00:41:42 +0000 (00:41 +0000)]
Automatically generated installer lang files
Michael de Raadt [Fri, 18 Jul 2014 07:30:33 +0000 (15:30 +0800)]
MDL-46427 Course: Correcting dimmed course link class on profile pages.
Jason Fowler [Fri, 18 Jul 2014 00:22:17 +0000 (08:22 +0800)]
MDL-42909 Course: Fix title for move-targets
Andrew Davis [Thu, 10 Jul 2014 08:16:26 +0000 (16:16 +0800)]
MDL-46316 notes: coding style fixes
Mark Nelson [Wed, 16 Jul 2014 23:18:16 +0000 (16:18 -0700)]
MDL-34248 core_backup: used API instead of inserting into the log table directly
Jim Thorpe [Wed, 16 Jul 2014 23:57:00 +0000 (11:57 +1200)]
enrol_imsenterprise: MDL-46363 including course lib when create_course is
used
Sam Hemelryk [Thu, 17 Jul 2014 00:52:18 +0000 (12:52 +1200)]
MDL-46335 backup: fixed casting issue with setting labels
The issue was that clean_param took an int and returned a string
and the result was used in an exact comparison.
The type change mean the comparison failed.
The solution was to ensure the param was cast as a string.
Sam Hemelryk [Thu, 29 May 2014 23:27:10 +0000 (11:27 +1200)]
MDL-45724 cache: admin screen now shows store warnings
Implemented a means by which cache store instance can communicate
warnings due to things such as conflicting configurations etc.
John Okely [Thu, 17 Jul 2014 08:42:42 +0000 (16:42 +0800)]
MDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_config to note they are used in lib/db/upgrade.php
Dan Poltawski [Thu, 17 Jul 2014 08:22:43 +0000 (09:22 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 17 Jul 2014 08:22:40 +0000 (09:22 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Sam Hemelryk [Thu, 17 Jul 2014 03:16:07 +0000 (15:16 +1200)]
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle
Conflicts:
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/tests/behat/completion_condition_passing_grade.feature
Brian Barnes [Wed, 16 Jul 2014 22:32:05 +0000 (10:32 +1200)]
MDL-46406 core_auth: Placed remember username before submit login form
Sam Hemelryk [Thu, 17 Jul 2014 01:57:29 +0000 (13:57 +1200)]
Revert "MDL-46226 core: pix_icon no longer sets title to the alt text"
This reverts commit
40ebfaeefd0940049ce2ef6e481546d90f19b9af.
Sam Hemelryk [Thu, 17 Jul 2014 01:57:01 +0000 (13:57 +1200)]
Revert "MDL-46226 fix unit tests"
This reverts commit
ffd17daf0a438fa63a32d3c1ba08218e16def46c.
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files
