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
markv [Thu, 18 Sep 2014 19:50:36 +0000 (12:50 -0700)]
MDL-10971 question type multianswer: Respect quiz shuffle option
sam marshall [Fri, 29 Aug 2014 17:51:18 +0000 (18:51 +0100)]
MDL-46991 Availability: Conditional dates not updated on restore
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
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
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
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
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.
Andrew Nicols [Thu, 11 Sep 2014 00:46:52 +0000 (08:46 +0800)]
MDL-47206 core: Allow tool plugins to run tasks
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Marina Glancy [Thu, 11 Sep 2014 08:12:25 +0000 (16:12 +0800)]
MDL-46585 lang: display debugging message when deprecated string is used
Marina Glancy [Thu, 24 Jul 2014 08:27:09 +0000 (16:27 +0800)]
MDL-35468 cohorts: upload cohorts from csv file
Marina Glancy [Tue, 9 Sep 2014 02:51:20 +0000 (10:51 +0800)]
MDL-35468 behat: escape user supplied strings in xpath
Marina Glancy [Thu, 11 Sep 2014 08:11:29 +0000 (16:11 +0800)]
MDL-46585 lang: 6 unused strings 'hidden' are deprecated
Strings are not used in the components where they are defined.
If they are used in other components they should be defined in appropriate locations
since the translation may depend on the subject that is being hidden.
Adam Olley [Thu, 11 Sep 2014 05:33:40 +0000 (15:03 +0930)]
MDL-47208 core_availability: Return false when cm isnt in modinfo list
If a cm isn't in modinfo's cm list, then the user shouldn't be able to see that cm.
This fixes an issue where hidden activities would cause users to be unable to use moodle.
Tim Hunt [Mon, 8 Sep 2014 17:26:06 +0000 (18:26 +0100)]
MDL-46747 questions: add More info link to qbehaviour help.
Thanks to Tony Gardner-Medwin for the suggestion.
Dan Poltawski [Thu, 11 Sep 2014 14:44:24 +0000 (15:44 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 11 Sep 2014 14:44:21 +0000 (15:44 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Frederic Massart [Thu, 11 Sep 2014 07:16:31 +0000 (15:16 +0800)]
MDL-47209 repository_skydrive: Use new oauth URLs
Marina Glancy [Wed, 10 Sep 2014 09:06:07 +0000 (17:06 +0800)]
MDL-46834 dndupload: check course dndupload cap on course level
Marina Glancy [Thu, 11 Sep 2014 02:54:40 +0000 (10:54 +0800)]
Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle"
This reverts commit
4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54, reversing
changes made to
a788aade7ce694b3f36c8e27295c60a5178c5b23.
AMOS bot [Wed, 10 Sep 2014 16:05:38 +0000 (00:05 +0800)]
Automatically generated installer lang files
Andrew Schmadel [Fri, 22 Aug 2014 23:09:18 +0000 (19:09 -0400)]
MDL-46844 Embed LTI External Tools with an IFrame
Clears up weird browser issues that occur when embedding content with an
`<object>` tag.
Rajesh Taneja [Wed, 10 Sep 2014 07:09:44 +0000 (15:09 +0800)]
MDL-46572 behat: Select user dialogue is not visible in phantomjs
Marina Glancy [Wed, 10 Sep 2014 07:00:35 +0000 (15:00 +0800)]
MDL-46834 dndupload: check course dndupload cap on course level
Marina Glancy [Wed, 10 Sep 2014 03:55:03 +0000 (11:55 +0800)]
MDL-47187 assign: fixed timing unittest failure
Brian Barnes [Wed, 10 Sep 2014 02:08:50 +0000 (14:08 +1200)]
MDL-47186 calendar: Changed month name to h2 from h1
Marina Glancy [Wed, 10 Sep 2014 03:18:52 +0000 (11:18 +0800)]
Revert "Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle"
This reverts commit
0e88fe02274f15b8ca8bfc1470a56b82f553d0d0, reversing
changes made to
de62e57a9b8a535d661bd93a3c800bc5f83d5d30.
Marina Glancy [Wed, 10 Sep 2014 02:50:06 +0000 (10:50 +0800)]
Merge branch 'MDL-46818-master-fixup' of https://github.com/FMCorz/moodle
Frederic Massart [Wed, 10 Sep 2014 02:43:16 +0000 (10:43 +0800)]
MDL-46818 core_grade: Prevent form checker to catch move fields
Andrew Nicols [Wed, 10 Sep 2014 02:00:00 +0000 (10:00 +0800)]
MDL-47107 mod_forum: is_subscribed $cm input does not need to be a cm_info
Tim Hunt [Sat, 6 Sep 2014 14:26:23 +0000 (15:26 +0100)]
MDL-46331 GIFT question import was breaking content inside <pre>.
Also, adding a Behat tests to verify GIFT import works without errors
(but leaving the detailed testing for the unit tests).
Tim Hunt [Mon, 8 Sep 2014 21:20:16 +0000 (22:20 +0100)]
MDL-47167 XML question format: behat tests
Tim Hunt [Mon, 8 Sep 2014 20:52:20 +0000 (21:52 +0100)]
MDL-46195 WebCT question import: Behat test
AMOS bot [Tue, 9 Sep 2014 16:05:28 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 9 Sep 2014 09:35:48 +0000 (10:35 +0100)]
Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 9 Sep 2014 09:18:42 +0000 (17:18 +0800)]
Merge branch 'MDL-46997-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 9 Sep 2014 09:16:15 +0000 (17:16 +0800)]
Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle
Marina Glancy [Tue, 9 Sep 2014 09:12:28 +0000 (17:12 +0800)]
Merge branch 'master_MDL-47076' of git://github.com/totara/moodle
Damyon Wiese [Tue, 9 Sep 2014 02:43:41 +0000 (10:43 +0800)]
MDL-46997 Grades: fix sum of grades with hidden items with differing maxgrades
Damyon Wiese [Fri, 29 Aug 2014 01:48:44 +0000 (09:48 +0800)]
MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies
Includes a unit test for the dependency flattening function.
Damyon Wiese [Fri, 29 Aug 2014 06:56:11 +0000 (14:56 +0800)]
MDL-46997 Grades: Improve the behat tests for grade aggregation
The tests now cover hidden grades in sub categories for all aggregation types. This change
includes a data generator for grade categories, with unit tests and behat tests for
the generator.
Marina Glancy [Wed, 3 Sep 2014 07:45:47 +0000 (15:45 +0800)]
MDL-47080 theme: call format_string on site shortname
Dan Poltawski [Tue, 9 Sep 2014 08:18:00 +0000 (09:18 +0100)]
Merge branch 'MDL-46572_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)]
Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Tue, 9 Sep 2014 07:06:40 +0000 (08:06 +0100)]
Merge branch 'wip-MDL-46834-master' of git://github.com/marinaglancy/moodle
David Curry [Wed, 3 Sep 2014 03:51:22 +0000 (15:51 +1200)]
MDL-47076 badges: Add checks to user fields during badges restoration
Change-Id: Iff6402d1da835ed57dc17d079adf1bbd2e76dd6c
Frederic Massart [Tue, 9 Sep 2014 02:21:16 +0000 (10:21 +0800)]
MDL-46696 backup: Handle older backups not containing grade history
Marina Glancy [Thu, 4 Sep 2014 07:46:20 +0000 (15:46 +0800)]
MDL-46834 dndupload: Hide dnd message when user cant upload files
Marina Glancy [Tue, 9 Sep 2014 02:01:35 +0000 (10:01 +0800)]
MDL-46834 filepicker: dnd upload should respect the current context id
Adrian Greeve [Mon, 8 Sep 2014 02:53:38 +0000 (10:53 +0800)]
MDL-40356 lib: Unit tests for the alternativefullnameformat setting.
Adrian Greeve [Mon, 21 Jul 2014 04:24:57 +0000 (12:24 +0800)]
MDL-40356 lib: Added a new setting to display more information from the fullname function.
Eloy Lafuente (stronk7) [Tue, 9 Sep 2014 00:18:59 +0000 (02:18 +0200)]
Merge branch 'm28_MDL-47054' of git://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 9 Sep 2014 00:15:26 +0000 (02:15 +0200)]
Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 8 Sep 2014 23:33:44 +0000 (01:33 +0200)]
Merge branch 'MDL-46428_master3' of https://github.com/Syxton/moodle
Tim Hunt [Sat, 6 Sep 2014 19:40:49 +0000 (20:40 +0100)]
MDL-46195 fix error handling.
Dan Poltawski [Mon, 8 Sep 2014 16:26:56 +0000 (17:26 +0100)]
Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle
Dan Poltawski [Mon, 8 Sep 2014 15:30:33 +0000 (16:30 +0100)]
Merge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Sep 2014 15:23:59 +0000 (16:23 +0100)]
Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 8 Sep 2014 14:31:13 +0000 (15:31 +0100)]
Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 8 Sep 2014 14:16:38 +0000 (15:16 +0100)]
Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Sep 2014 13:28:30 +0000 (14:28 +0100)]
Merge branch 'MDL-47122' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 8 Sep 2014 12:24:17 +0000 (13:24 +0100)]
MDL-47122 question_engine_data_mapper: which methods are public.
That is, which may be used from outside the question engine.
Dan Poltawski [Mon, 8 Sep 2014 11:22:27 +0000 (12:22 +0100)]
Merge branch 'MDL-46982' of https://github.com/shashirepo/moodle
Dan Poltawski [Mon, 8 Sep 2014 11:19:24 +0000 (12:19 +0100)]
Merge branch 'MDL-47014' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 8 Sep 2014 11:14:51 +0000 (12:14 +0100)]
Merge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle
Juan Leyva [Wed, 3 Sep 2014 11:45:21 +0000 (13:45 +0200)]
MDL-47014 airnotifier: Missing require of filelib.php
