Marina Glancy [Sat, 18 Jul 2015 02:38:19 +0000 (10:38 +0800)]
MDL-50919 tags: new UI for managing tags
Marina Glancy [Mon, 10 Aug 2015 08:06:15 +0000 (16:06 +0800)]
MDL-50919 behat: Step for keypress event in behat
David Monllao [Wed, 2 Sep 2015 02:23:25 +0000 (10:23 +0800)]
MDL-51172 core_files: Using an invented file format
David Monllao [Wed, 2 Sep 2015 02:25:24 +0000 (10:25 +0800)]
Merge branch 'MDL-51172' of git://github.com/ramdesh/moodle
David Monllao [Wed, 2 Sep 2015 01:58:17 +0000 (09:58 +0800)]
Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle
David Monllao [Wed, 2 Sep 2015 01:47:34 +0000 (09:47 +0800)]
Merge branch 'MDL-51090' of git://github.com/timhunt/moodle
David Monllao [Wed, 2 Sep 2015 01:23:11 +0000 (09:23 +0800)]
Merge branch 'MDL-50971' of git://github.com/NeillM/moodle
David Monllao [Wed, 2 Sep 2015 00:54:55 +0000 (08:54 +0800)]
Merge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/deprecatedlib.php
David Monllao [Wed, 2 Sep 2015 00:44:36 +0000 (08:44 +0800)]
Merge branch 'MDL-50920' of git://github.com/sk-unikent/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)]
Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 23:20:09 +0000 (01:20 +0200)]
MDL-43896 admin: Avoid empty(expression), not working under PHP 5.4
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 22:32:13 +0000 (00:32 +0200)]
Merge branch 'MDL-48494-master-component' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Sep 2015 22:29:29 +0000 (00:29 +0200)]
Merge branch 'MDL-43896-master-modulesyntax' of git://github.com/mudrd8mz/moodle
Tim Hunt [Thu, 20 Aug 2015 20:17:24 +0000 (21:17 +0100)]
MDL-51090 question: further refinements to validating manual grades
Dan Poltawski [Tue, 1 Sep 2015 20:11:11 +0000 (21:11 +0100)]
MDL-50690 themes: fix commenting coding style
(See also CONTRIB-5891)
Dan Poltawski [Tue, 1 Sep 2015 19:59:58 +0000 (20:59 +0100)]
Merge branch 'wip_MDL-50690_master' of git://github.com/gjb2048/moodle
Dan Poltawski [Tue, 1 Sep 2015 15:20:34 +0000 (16:20 +0100)]
Merge branch 'MDL-49950_duplicate_string' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 1 Sep 2015 14:18:31 +0000 (15:18 +0100)]
Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 1 Sep 2015 11:43:23 +0000 (12:43 +0100)]
MDL-38763 fix trailing whitespace
Dan Poltawski [Tue, 1 Sep 2015 11:17:05 +0000 (12:17 +0100)]
Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle
David Monllao [Tue, 1 Sep 2015 10:33:40 +0000 (18:33 +0800)]
Merge branch 'MDL-51234-master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
David Monllao [Tue, 1 Sep 2015 10:31:26 +0000 (18:31 +0800)]
Merge branch 'MDL-51109-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Fri, 21 Aug 2015 13:48:36 +0000 (14:48 +0100)]
MDL-51109 task: more debug info for failed scheduled tasks
Dan Poltawski [Tue, 1 Sep 2015 09:36:17 +0000 (10:36 +0100)]
Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 1 Sep 2015 09:14:45 +0000 (10:14 +0100)]
Merge branch 'MDL-45841' of git://github.com/timhunt/moodle
David Monllao [Tue, 1 Sep 2015 08:06:14 +0000 (16:06 +0800)]
Merge branch 'wip-mdl-50963' of git://github.com/rajeshtaneja/moodle
David Monllao [Tue, 1 Sep 2015 08:00:32 +0000 (16:00 +0800)]
MDL-51179 editor_atto: Updating since tag to only 3.0
This commit should be reverted if we finally backport this solution.
David Monllao [Tue, 1 Sep 2015 07:57:21 +0000 (15:57 +0800)]
Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle
Conflicts:
lib/upgrade.txt
rajesh Taneja [Tue, 1 Sep 2015 06:43:52 +0000 (14:43 +0800)]
MDL-50963 behat: fixed error string in behat
David Monllao [Tue, 1 Sep 2015 06:35:18 +0000 (14:35 +0800)]
Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle
Martin Mastny [Tue, 7 Apr 2015 01:21:46 +0000 (09:21 +0800)]
MDL-38763 core_role: AMD module for managing permissions
David Monllao [Tue, 1 Sep 2015 04:32:00 +0000 (12:32 +0800)]
MDL-51013 themes: Info about new navbar_button function
Kevin Wiliarty [Thu, 6 Aug 2015 04:16:19 +0000 (00:16 -0400)]
MDL-51013 themes: Suppress navbar button when custom menu is empty
Damyon Wiese [Tue, 1 Sep 2015 04:23:00 +0000 (12:23 +0800)]
MDL-51179 Atto: Extend autosave fix to cover text changes
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.
When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.
There is also a new scheduled task for cleaning Atto autosave drafts.
Eloy Lafuente (stronk7) [Mon, 31 Aug 2015 23:52:10 +0000 (01:52 +0200)]
Merge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 31 Aug 2015 23:42:06 +0000 (01:42 +0200)]
Merge branch 'mdl-50963' of https://github.com/cdsmith-umn/moodle
Eloy Lafuente (stronk7) [Mon, 31 Aug 2015 18:48:18 +0000 (20:48 +0200)]
Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Mon, 31 Aug 2015 18:31:26 +0000 (20:31 +0200)]
Merge branch 'MDL-50677-master' of git://github.com/FMCorz/moodle
Marina Glancy [Thu, 6 Aug 2015 02:19:55 +0000 (10:19 +0800)]
MDL-25451 roles: check if user can assign foles in block
David Mudrák [Thu, 6 Aug 2015 13:59:40 +0000 (15:59 +0200)]
MDL-48494 admin: Fail validation of plugins with no component declared
David Mudrák [Thu, 6 Aug 2015 12:19:58 +0000 (14:19 +0200)]
MDL-48494 admin: Require plugins declare their component in version.php
David Mudrák [Thu, 6 Aug 2015 13:13:52 +0000 (15:13 +0200)]
MDL-43896 admin: Fail validation of plugins with $module in version.php
David Mudrák [Thu, 6 Aug 2015 10:33:56 +0000 (12:33 +0200)]
MDL-43896 admin: Drop support for the $module syntax in version.php
David Monllao [Mon, 31 Aug 2015 06:07:49 +0000 (14:07 +0800)]
Merge branch 'MDL-51131-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 31 Aug 2015 04:54:49 +0000 (12:54 +0800)]
Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 31 Aug 2015 02:55:08 +0000 (10:55 +0800)]
Merge branch 'MDL-51181-m' of git://github.com/micaherne/moodle
David Monllao [Mon, 31 Aug 2015 02:45:19 +0000 (10:45 +0800)]
Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle
lazydaisy [Sun, 30 Aug 2015 18:59:28 +0000 (19:59 +0100)]
MDL-51234 theme_bootstrapbase: hover hardly visible on invert/collapse
Kevin Wiliarty [Thu, 27 Aug 2015 15:59:14 +0000 (11:59 -0400)]
MDL-51229 theme: display docked block on top of fixed navbar
Neill Magill [Tue, 4 Aug 2015 15:31:54 +0000 (16:31 +0100)]
MDL-50971 ActionMenu: Action menus cause page to jump when closing
This patch changes the behavior of open action menus when using a mouse.
Before this patch when clicking on the page with an open action menu the focus would be
returned to the action menu's call button. This could cause the page to jump when a
mouse user did not close an action menu, scrolled and then tried to perform another
action on the page.
After this patch when clicking the focus will not be returned to the action menu's call button.
The behavior of the script will not be changed when using the keyboard.
Marina Glancy [Wed, 12 Aug 2015 06:12:09 +0000 (14:12 +0800)]
MDL-51084 tool_customlang: return to the same page after submit
Dan Poltawski [Fri, 28 Aug 2015 06:38:07 +0000 (07:38 +0100)]
weekly release 3.0dev
Andrew Nicols [Wed, 5 Aug 2015 07:20:23 +0000 (15:20 +0800)]
MDL-50891 useragent: Move web crawler checks to useragent class
Andrew Nicols [Fri, 28 Aug 2015 06:22:05 +0000 (14:22 +0800)]
MDL-51236 phpunit: Prevent testsuite name conflicts
The testsuite name is fed straight into a class_exists() in
PHPUnit_Framework_TestSuite. In some cases, e.g. cachestore_static, the
class does exist, it's then fed into a ReflectionClass, and the test fails.
The testsuite needs to not conflict with any classes which could be
autoloaded in Moodle core.
Damyon Wiese [Fri, 28 Aug 2015 04:09:34 +0000 (12:09 +0800)]
MDL-51179 Atto: Add a behat test for autosave
Ryan Wyllie [Wed, 26 Aug 2015 07:52:19 +0000 (07:52 +0000)]
MDL-49536 theme_clean: logo only on front and login
The logo for the clean and more themes will only be
displayed on the front page and login page as it was
replacing the header information on other pages within
Moodle, causing users to lose information on the page.
Gareth J Barnard [Thu, 27 Aug 2015 14:35:23 +0000 (15:35 +0100)]
MDL-50690 themes: Theme cache SVG images are not created.
Dan Poltawski [Thu, 27 Aug 2015 09:09:33 +0000 (10:09 +0100)]
MDL-49826 grade: hide singleview links when no permissions
Singleview only supports grade editors not viewers at this time.
Eloy Lafuente (stronk7) [Thu, 27 Aug 2015 10:46:11 +0000 (12:46 +0200)]
Merge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle
Frederic Massart [Thu, 27 Aug 2015 09:28:02 +0000 (17:28 +0800)]
MDL-50677 user: Prefix custom fields node name in profile tree
Marina Glancy [Thu, 27 Aug 2015 03:02:45 +0000 (11:02 +0800)]
MDL-51215 course: redirect to manage appropriate category
David Mudrák [Wed, 26 Aug 2015 15:03:36 +0000 (17:03 +0200)]
MDL-51148 tool_langimport: Use the amended string in Behat test
Helen Foster [Wed, 26 Aug 2015 14:46:43 +0000 (16:46 +0200)]
MDL-51148 lang: Merge English strings from the en_fix language pack
Dan Poltawski [Wed, 26 Aug 2015 07:02:42 +0000 (08:02 +0100)]
MDL-50641 rss: fix front page rss links
Fallback to guest user token when no user is specified in rss_get_url
rather than generating a junk token which is no use to anyone, this
matches existing logic which has been in place in forum for a while
and avoids custom handling all over the place.
Damyon Wiese [Wed, 26 Aug 2015 06:04:50 +0000 (14:04 +0800)]
MDL-51179 Atto: When a resume is aborted - create a fresh draft for future saves.
David Monllao [Wed, 26 Aug 2015 01:44:21 +0000 (09:44 +0800)]
Merge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle
Marina Glancy [Wed, 26 Aug 2015 01:32:07 +0000 (09:32 +0800)]
MDL-50923 themes: content-only class added before region-only
Andrew Davis [Tue, 25 Aug 2015 21:40:31 +0000 (05:40 +0800)]
MDL-49950 removed a duplicate string definition
Andrew Davis [Tue, 25 Aug 2015 13:14:47 +0000 (21:14 +0800)]
MDL-50529 core_grade: removed duplicate code
Eloy Lafuente (stronk7) [Tue, 25 Aug 2015 09:34:33 +0000 (11:34 +0200)]
Merge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 25 Aug 2015 08:54:40 +0000 (09:54 +0100)]
Merge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 25 Aug 2015 08:09:57 +0000 (16:09 +0800)]
MDL-51179 Atto: Abort autosave if there are more recent changes to the files
If the files in the draft area have been modified more recently than the timestamp
of the draft - do not restore the files, or you will delete any newer files. We
cannot really guess here - merging the 2 lists of files will be wrong.
David Monllao [Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)]
Merge branch 'MDL-50933' of git://github.com/timhunt/moodle
David Monllao [Tue, 25 Aug 2015 06:26:25 +0000 (14:26 +0800)]
Merge branch 'MDL-50996' of git://github.com/timhunt/moodle
Ramindu Deshapriya [Tue, 25 Aug 2015 03:19:01 +0000 (08:49 +0530)]
MDL-51172 core_files: Added Behat test to automate MDLQA-8166
David Monllao [Tue, 25 Aug 2015 02:13:18 +0000 (10:13 +0800)]
Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 25 Aug 2015 02:06:49 +0000 (10:06 +0800)]
Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle
Adrian Greeve [Fri, 14 Aug 2015 01:25:32 +0000 (09:25 +0800)]
MDL-27177 roles: Update to behat full profile tests.
Adrian Greeve [Wed, 10 Jun 2015 08:32:13 +0000 (16:32 +0800)]
MDL-27177 roles: Unit test for newly created function.
Adrian Greeve [Wed, 10 Jun 2015 06:40:26 +0000 (14:40 +0800)]
MDL-27177 roles: Allow students to see co-students profiles.
If the student shares a course with another student then let them
see the same detail on the full profile page as they do on the
course profile page.
Eloy Lafuente (stronk7) [Mon, 24 Aug 2015 22:06:01 +0000 (00:06 +0200)]
Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle
Tim Hunt [Sat, 22 Aug 2015 15:37:12 +0000 (16:37 +0100)]
MDL-45841 forum: show unread posts on blog-style forum front page
Dan Poltawski [Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)]
Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle
Clement Smith [Thu, 30 Jul 2015 12:44:42 +0000 (07:44 -0500)]
MDL-50957 grade/report/user: Fix division by zero
When using "sum of grades" and $grademax is zero, a division by zero
error occurs in fill_contributions_column() in
grade/report/user/lib.php.
Dan Poltawski [Mon, 24 Aug 2015 13:51:58 +0000 (14:51 +0100)]
MDL-50723 upgrade.txt: Note dropped unused table
Just in case..
Dan Poltawski [Mon, 24 Aug 2015 13:47:25 +0000 (14:47 +0100)]
Merge branch 'MDL-50723-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 24 Aug 2015 12:40:15 +0000 (13:40 +0100)]
Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 24 Aug 2015 09:55:03 +0000 (10:55 +0100)]
Merge branch 'wip-MDL-27859-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 24 Aug 2015 09:39:06 +0000 (10:39 +0100)]
Merge branch 'MDL-49826_grade_single_view' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 24 Aug 2015 09:25:32 +0000 (10:25 +0100)]
Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle
Tim Hunt [Tue, 4 Aug 2015 16:26:12 +0000 (17:26 +0100)]
MDL-50996 quiz: fix review error with unusual permissions
Michael Aherne [Mon, 24 Aug 2015 08:06:26 +0000 (09:06 +0100)]
MDL-51181 config: Correct documentation of lock_factory
David Monllao [Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)]
Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle
David Monllao [Mon, 24 Aug 2015 07:29:58 +0000 (15:29 +0800)]
Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Mon, 24 Aug 2015 02:59:30 +0000 (10:59 +0800)]
MDL-51184 themes: correctly check $CFG->svgicons
Thanks to Ralf Wiederhold for pointing out the bug
Damyon Wiese [Mon, 17 Aug 2015 08:55:56 +0000 (16:55 +0800)]
MDL-51116 Mustache: Caching issue exists with mustache templates
The first ajax load fetches the template and puts it in localstorage + a js var
The second load gets it from local storage, but does not put it in the js var.
The pix_icon helper expects it to be in the js var always.
Bruce Silver [Mon, 3 Aug 2015 17:37:39 +0000 (18:37 +0100)]
MDL-50958 block_messages: declare missing stdClass object
David Monllao [Mon, 24 Aug 2015 02:18:14 +0000 (10:18 +0800)]
Merge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Sat, 22 Aug 2015 13:45:06 +0000 (21:45 +0800)]
MDL-51131 tags: remove instances when course is deleted
Tim Hunt [Mon, 27 Jul 2015 18:31:39 +0000 (19:31 +0100)]
MDL-50933 quiz: improve completion behat tests
These now use the faster set-up methods.