69211 Commits

Author SHA1 Message Date
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
e5b5b5be4d MDL-44116 Atto Accessbility checker: Additional sniffs. 2014-07-21 15:18:22 +08:00
Damyon Wiese
fd57c17e2d 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.
2014-07-21 15:01:54 +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
Adam Olley
9b3b8e51c9 MDL-46456 mod_lti: Fixed Y.one selector in mod_form.js 2014-07-21 12:58:13 +09:30
Simey Lameze
feff774adb MDL-43063 core: fix phpdoc comment codechecker issue. 2014-07-21 10:08:41 +08:00
Brian Barnes
a15691beeb MDL-46431 javascript_notifications: changed dialogue headings to h3's 2014-07-21 13:59:34 +12:00
Julien Boulen
36489c0b41 MDL-46206 Accessibility: Remove alt attribute for footer image 2014-07-21 08:19:23 +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
Michael de Raadt
846abed55f MDL-46427 Course: Correcting dimmed course link class on profile pages. 2014-07-18 15:30:33 +08:00
Jason Fowler
33b6b8c93e MDL-42909 Course: Fix title for move-targets 2014-07-18 14:42:00 +08:00
Andrew Davis
ed6fc2620c MDL-46316 notes: coding style fixes 2014-07-18 13:43:17 +08:00
Mark Nelson
115e8964db MDL-34248 core_backup: used API instead of inserting into the log table directly 2014-07-17 18:11:26 -07:00
Jim Thorpe
18b19ff452 enrol_imsenterprise: MDL-46363 including course lib when create_course is
used
2014-07-18 11:28:12 +12:00
Sam Hemelryk
a8266e2f1c 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.
2014-07-18 08:29:55 +12:00
Sam Hemelryk
727c21733e 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.
2014-07-18 08:29:41 +12:00
John Okely
08b51dd06b 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 2014-07-17 16:42:42 +08:00
Dan Poltawski
ec36fafc0f weekly release 2.8dev 2014-07-17 09:22:43 +01:00
Dan Poltawski
fcc7e4d9b3 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-17 09:22:40 +01:00
Sam Hemelryk
e6330e5ba8 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
2014-07-17 15:16:07 +12:00
Brian Barnes
22f8a34998 MDL-46406 core_auth: Placed remember username before submit login form 2014-07-17 14:03:50 +12:00
Sam Hemelryk
68b1e63080 Revert "MDL-46226 core: pix_icon no longer sets title to the alt text"
This reverts commit 40ebfaeefd0940049ce2ef6e481546d90f19b9af.
2014-07-17 13:57:29 +12:00
Sam Hemelryk
4ae7774d03 Revert "MDL-46226 fix unit tests"
This reverts commit ffd17daf0a438fa63a32d3c1ba08218e16def46c.
2014-07-17 13:57:01 +12:00
AMOS bot
92141ef5a2 Automatically generated installer lang files 2014-07-17 00:52:42 +00:00
AMOS bot
bf2fc356ba Automatically generated installer lang files 2014-07-17 00:52:42 +00:00
Ray Morris
349c930343 MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)
2014-07-16 19:17:57 -05:00
Mark Nelson
3c05db790a MDL-45594 core_message: added unit tests 2014-07-16 17:05:39 -07:00
Mark Nelson
4bf64077f6 MDL-45594 core_message: ordered recent notifications by timecreated 2014-07-16 17:05:39 -07:00
Tim Hunt
ac83a119c5 MDL-45594 simplify message_get_recent_conversations SQL
I am pretty sure that this new SQL is logically equivalent to
the original, and it passes Mark's unit tests. However, it is
hard to be 100% sure.
2014-07-16 17:05:39 -07:00