Sam Hemelryk [Sun, 28 Sep 2014 20:02:52 +0000 (09:02 +1300)]
Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 19:44:43 +0000 (08:44 +1300)]
MDL-47252 mod_forum: fixed whitespace
Sam Hemelryk [Sun, 28 Sep 2014 19:43:51 +0000 (08:43 +1300)]
Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 16:27:40 +0000 (18:27 +0200)]
MDL-47242 theme_bootstrapbase: Fixed whitespace (take2)
Seems that previous whitespace fix was not ok.
sam marshall [Tue, 23 Sep 2014 11:09:03 +0000 (12:09 +0100)]
MDL-47380 Availability: Editing interface broken in IE8
Dan Poltawski [Thu, 25 Sep 2014 10:17:51 +0000 (11:17 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 25 Sep 2014 10:17:48 +0000 (11:17 +0100)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Thu, 25 Sep 2014 10:17:47 +0000 (11:17 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Sam Hemelryk [Thu, 25 Sep 2014 00:19:13 +0000 (12:19 +1200)]
MDL-47242: Fixed whitespace
Jetha Chan [Wed, 24 Sep 2014 07:53:42 +0000 (15:53 +0800)]
MDL-47242 theme_bootstrapbase: inverted color and RTL fixes
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:37:22 +0000 (01:37 +0200)]
Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:26:52 +0000 (01:26 +0200)]
Merge branch 'MDL-47224' of git://github.com/aolley/moodle
Marina Glancy [Wed, 30 Apr 2014 06:30:51 +0000 (14:30 +0800)]
MDL-45336 lesson: copied used strings from quiz
AMOS BEGIN
CPY [false,mod_quiz],[false,mod_lesson]
CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:53:12 +0000 (14:53 +0800)]
MDL-45336 questionbank: use core strings instead of quiz
AMOS BEGIN
CPY [categories,mod_quiz],[categories,question]
CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
CPY [export,mod_quiz],[export,core_question]
CPY [import,mod_quiz],[import,core_question]
AMOS END
Marina Glancy [Thu, 18 Sep 2014 06:35:03 +0000 (14:35 +0800)]
MDL-45336 qtype_numerical: use own strings instead of mod_quiz
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.
AMOS BEGIN
CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
CPY [multiplier,mod_quiz],[qtype_numerical]
CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:35:18 +0000 (14:35 +0800)]
MDL-45336 question: moved used string from quiz plugin
AMOS BEGIN
MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:33:43 +0000 (14:33 +0800)]
MDL-45336 scorm: copied used string from quiz
AMOS BEGIN
CPY [deleteselected,quiz_overview],[deleteselected,mod_scorm]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:31:51 +0000 (14:31 +0800)]
MDL-45336 choice: removed unused code
function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.
Marina Glancy [Wed, 30 Apr 2014 06:28:59 +0000 (14:28 +0800)]
MDL-45336 backup: moved the string from quiz to core
AMOS BEGIN
CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 22:56:40 +0000 (00:56 +0200)]
MDL-47180 qformat_webct: whitespace cleanup
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 22:40:40 +0000 (00:40 +0200)]
Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle
AMOS bot [Tue, 23 Sep 2014 16:05:53 +0000 (00:05 +0800)]
Automatically generated installer lang files
Jean-Michel Vedrine [Tue, 9 Sep 2014 15:06:22 +0000 (17:06 +0200)]
MDL-47180 qformat_webct: Import of calculated questions broken
Dan Poltawski [Tue, 23 Sep 2014 09:57:00 +0000 (10:57 +0100)]
Merge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 23 Sep 2014 04:36:05 +0000 (16:36 +1200)]
Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 23 Sep 2014 04:32:09 +0000 (16:32 +1200)]
Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)]
Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle
Dave Cooper [Tue, 16 Sep 2014 09:19:54 +0000 (17:19 +0800)]
MDL-47252 mod_forum: Ensure guest users can't subscribe to discussions
Sam Hemelryk [Tue, 23 Sep 2014 00:23:08 +0000 (12:23 +1200)]
Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:52:10 +0000 (01:52 +0200)]
Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:48:21 +0000 (01:48 +0200)]
Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:40:50 +0000 (01:40 +0200)]
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:28:29 +0000 (01:28 +0200)]
Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)]
Merge branch 'MDL-47266' of git://github.com/timhunt/moodle
Tim Hunt [Sun, 14 Sep 2014 13:14:11 +0000 (14:14 +0100)]
MDL-37998 quiz settings: disableif rules should account for overrides.
Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.
Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.
Dan Poltawski [Mon, 22 Sep 2014 15:13:20 +0000 (16:13 +0100)]
Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 22 Sep 2014 15:08:19 +0000 (16:08 +0100)]
Merge branch 'MDL-47276' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 15:03:50 +0000 (16:03 +0100)]
Merge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetrowi/moodle
Dan Poltawski [Mon, 22 Sep 2014 14:02:51 +0000 (15:02 +0100)]
Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 22 Sep 2014 10:55:47 +0000 (11:55 +0100)]
Merge branch 'MDL-40006' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 10:39:42 +0000 (11:39 +0100)]
Merge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 09:57:20 +0000 (10:57 +0100)]
Merge branch 'MDL-46991-master' of https://github.com/sammarshallou/moodle
Nadav Kavalerchik [Tue, 16 Sep 2014 15:48:00 +0000 (18:48 +0300)]
MDL-47269 yui/src/dock: Invert dock reset blocks icon, in RTL mode
Andrew Davis [Sun, 14 Sep 2014 12:49:16 +0000 (20:49 +0800)]
MDL-47238 core_user: added an error message if guests access user profiles and they aren't allowed to
Tim Hunt [Wed, 17 Sep 2014 07:27:39 +0000 (08:27 +0100)]
MDL-47276 quiz: change default for When time expires for new installs
Tim Hunt [Sat, 6 Sep 2014 21:27:11 +0000 (22:27 +0100)]
MDL-40006 searchableselector does not work in IE or Safari.
This fix is a horrible hack, but one I have used for years in tool_editrolesbycap
https://github.com/moodleou/moodle-tool_editrolesbycap/blob/master/yui/capabilityformfield/capabilityformfield.js
and it seems to be reliable.
As an added bonus, I removed the use of YUI2 here.
Also, I fixed the related button in quiz to be GET not POST.
markv [Thu, 18 Sep 2014 19:50:36 +0000 (12:50 -0700)]
MDL-10971 question type multianswer: Respect quiz shuffle option
Adam Olley [Fri, 12 Sep 2014 06:56:14 +0000 (16:26 +0930)]
MDL-47224 qtype_calculated: Calculated qtype comment on datasetitems should follow formatting rules
sam marshall [Mon, 15 Sep 2014 11:39:38 +0000 (12:39 +0100)]
MDL-47240 Modinfo: Section info accesses nonexisting property groupingid
This code wasn't actually used, so we should remove it.
sam marshall [Fri, 29 Aug 2014 17:51:18 +0000 (18:51 +0100)]
MDL-46991 Availability: Conditional dates not updated on restore
Tim Hunt [Tue, 16 Sep 2014 13:41:30 +0000 (14:41 +0100)]
MDL-47266 quiz: fix restore log message.
Marina Glancy [Mon, 15 Sep 2014 04:28:32 +0000 (12:28 +0800)]
MDL-46937 modinfo: Allow course format to overwrite section availability
Dan Poltawski [Thu, 18 Sep 2014 06:41:00 +0000 (07:41 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 18 Sep 2014 06:40:56 +0000 (07:40 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 18 Sep 2014 02:42:55 +0000 (10:42 +0800)]
MDL-46313 forum: Move discussiontoggle CSS to module
Matt Petro [Tue, 16 Sep 2014 16:50:53 +0000 (12:50 -0400)]
MDL-47270 core_component: make cache independent of filesystem ordering
Dan Poltawski [Tue, 16 Sep 2014 16:46:18 +0000 (17:46 +0100)]
MDL-47182 admin: warn about delayed scheduled tasks
Rather than using module cron, use scheduled tasks to work out
if cron has been running recently.
This is not perfect, the admin could disble all tasks, or reschedule
them - but its not complex to compute.
Eloy Lafuente (stronk7) [Tue, 16 Sep 2014 16:42:17 +0000 (18:42 +0200)]
Merge branch 'MDL-46613-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 16 Sep 2014 15:57:19 +0000 (17:57 +0200)]
Merge branch 'wip-MDL-47079-master' of git://github.com/marinaglancy/moodle
Juan Leyva [Wed, 3 Sep 2014 16:08:48 +0000 (18:08 +0200)]
MDL-46613 grades ws: Fixed external function declaration
Gradebook items with overridden grades was causing error as Web
Services response
Damyon Wiese [Tue, 16 Sep 2014 07:15:57 +0000 (15:15 +0800)]
Merge branch 'MDL-47225-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 16 Sep 2014 07:06:36 +0000 (15:06 +0800)]
MDL-44257 Message: Update phpdocs for email_to_user function
Andrew Nicols [Tue, 16 Sep 2014 07:07:11 +0000 (15:07 +0800)]
MDL-47225 core: Tidy up component normalisation tests
Andrew Nicols [Fri, 12 Sep 2014 07:13:46 +0000 (15:13 +0800)]
MDL-47225 core: Add ability to normalize component names
Damyon Wiese [Tue, 16 Sep 2014 06:58:48 +0000 (14:58 +0800)]
Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle
Jetha Chan [Tue, 16 Sep 2014 05:41:41 +0000 (13:41 +0800)]
MDL-46523 navigation: add body class when roleswitched and not in initial install
Matt Staroste [Tue, 16 Sep 2014 03:23:52 +0000 (11:23 +0800)]
MDL-46313 mod_forum: Replace subscription status icons
Adrian Greeve [Tue, 16 Sep 2014 02:58:05 +0000 (10:58 +0800)]
MDL-40356 lib: New setting to display full names.
This adds a new setting to display more name information for users
with the viewfullnames capability.
Adrian Greeve [Tue, 16 Sep 2014 02:57:28 +0000 (10:57 +0800)]
MDL-40356 lib: Unit tests for the alternativefullnameformat setting.
Simey Lameze [Tue, 16 Sep 2014 02:16:37 +0000 (10:16 +0800)]
MDL-44257 lib: fix the attachment code to accept tempdir and dataroot.
Credit goes to Damyon, thanks.
Simey Lameze [Fri, 12 Sep 2014 08:45:49 +0000 (16:45 +0800)]
MDL-44257 message: added test to make sure the stored file still exists
Marina Glancy [Fri, 5 Sep 2014 08:26:46 +0000 (16:26 +0800)]
MDL-47079 user: behat test for deleting users
Eloy Lafuente (stronk7) [Mon, 15 Sep 2014 22:23:09 +0000 (00:23 +0200)]
Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle
David Mudrák [Mon, 15 Sep 2014 16:04:20 +0000 (18:04 +0200)]
MDL-47248 Use new Moodle logo for RSS feeds generated by Moodle
Themes can override this logo as any other core pix file. The new logo copied
from https://moodle.org/logo/ and resized to match the previous logo size
(140x35px).
Dan Poltawski [Mon, 15 Sep 2014 15:07:05 +0000 (16:07 +0100)]
Merge branch 'MDL-46195' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 15 Sep 2014 12:00:24 +0000 (13:00 +0100)]
Merge branch 'wip-MDL-46585-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 15 Sep 2014 10:55:16 +0000 (11:55 +0100)]
Merge branch 'MDL-46331' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 15 Sep 2014 10:25:27 +0000 (11:25 +0100)]
Merge branch 'MDL-46810' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 15 Sep 2014 10:08:24 +0000 (11:08 +0100)]
Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 15 Sep 2014 10:02:48 +0000 (11:02 +0100)]
Merge branch 'MDL-47206-master' of git://github.com/andrewnicols/moodle
Jetha Chan [Mon, 15 Sep 2014 09:48:16 +0000 (17:48 +0800)]
MDL-47244 theme_bootstrapbase: fix custom_menu dividers under responsive layouts
Jetha Chan [Mon, 15 Sep 2014 09:23:54 +0000 (17:23 +0800)]
MDL-47242 theme_bootstrapbase: fix nested custom_menu responsive display
Damyon Wiese [Mon, 15 Sep 2014 09:02:43 +0000 (17:02 +0800)]
MDL-44447 Grade: Re-order lang strings
Damyon Wiese [Mon, 15 Sep 2014 08:49:23 +0000 (16:49 +0800)]
MDL-44447 Grade: Whitespace fix
Damyon Wiese [Mon, 15 Sep 2014 08:44:41 +0000 (16:44 +0800)]
Merge branch 'MDL-44447-master' of git://github.com/lameze/moodle
Simey Lameze [Fri, 22 Aug 2014 02:50:08 +0000 (10:50 +0800)]
MDL-44447 grade_export: Added multiple grade display types to grade export.
Damyon Wiese [Mon, 15 Sep 2014 08:41:28 +0000 (16:41 +0800)]
Merge branch 'MDL-47127-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 15 Sep 2014 08:13:33 +0000 (16:13 +0800)]
Merge branch 'MDL-47143' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 15 Sep 2014 07:41:39 +0000 (15:41 +0800)]
Merge branch 'MDL-47167' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 15 Sep 2014 07:08:31 +0000 (15:08 +0800)]
Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle
Damyon Wiese [Mon, 15 Sep 2014 06:16:59 +0000 (14:16 +0800)]
Merge branch 'm28_MDL-47186' of https://github.com/totara/moodle
Damyon Wiese [Mon, 15 Sep 2014 06:03:39 +0000 (14:03 +0800)]
Merge branch 'MDL-46747' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 15 Sep 2014 05:50:43 +0000 (13:50 +0800)]
Merge branch 'MDL-47209-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 15 Sep 2014 05:16:59 +0000 (13:16 +0800)]
Merge branch 'wip-MDL-35468-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 15 Sep 2014 04:25:32 +0000 (12:25 +0800)]
Merge branch 'MDL-47208' of git://github.com/aolley/moodle
AMOS bot [Sun, 14 Sep 2014 16:08:24 +0000 (00:08 +0800)]
Automatically generated installer lang files
Juan Leyva [Tue, 9 Sep 2014 07:22:20 +0000 (09:22 +0200)]
MDL-46588 web services: Fixed system context instanceid eq 0 case
Juan Leyva [Thu, 4 Sep 2014 09:06:48 +0000 (11:06 +0200)]
MDL-46588 web services: Unit tests added
Juan Leyva [Wed, 3 Sep 2014 20:26:40 +0000 (22:26 +0200)]
MDL-46588 web services: Fixed invalid check of empty contextid in function get_context_from_params
Simey Lameze [Fri, 25 Jul 2014 03:44:44 +0000 (11:44 +0800)]
MDL-44257 message: check if the attachment exists before remove it
Credit goes to Mark Nielsen, thanks.