David Monllao [Tue, 1 Sep 2015 06:35:18 +0000 (14:35 +0800)]
Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle
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
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
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
Kevin Wiliarty [Thu, 27 Aug 2015 15:59:14 +0000 (11:59 -0400)]
MDL-51229 theme: display docked block on top of fixed navbar
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
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.
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
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
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
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
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
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.
Marina Glancy [Sun, 16 Aug 2015 11:52:27 +0000 (19:52 +0800)]
MDL-27859 tags: unit test for tag cleanup
Marina Glancy [Sun, 16 Aug 2015 10:49:52 +0000 (18:49 +0800)]
MDL-27859 tags: unit test for correlated tags
Andrew Nicols [Wed, 12 Aug 2015 05:42:35 +0000 (13:42 +0800)]
MDL-50714 mod_forum: Add tests for all groupmodes
Andrew Nicols [Fri, 7 Aug 2015 03:27:20 +0000 (11:27 +0800)]
MDL-50714 mod_forum: Correct use of movedicussions cap when posting
The ability to view the group dropdown was too closely related to the
movediscussions capability when posting, or editing a forum post.
The movedicussions capability should only be considered for some parts of
this logic. Users should be able to select the group to post to when
writing message, as long as they have access to that group.
Gareth J Barnard [Thu, 23 Jul 2015 16:06:21 +0000 (17:06 +0100)]
MDL-50869 themes: Quiz feedback colours are not accessible.
Davo Smith [Thu, 20 Aug 2015 13:46:59 +0000 (14:46 +0100)]
MDL-49826 gradereport_singleview: fix permission check
Users with capability 'moodle/grade:edit' should be able to edit grade values
- 'moodle/grade:manage' is not needed, as grade items are not being changed.
Dan Poltawski [Thu, 20 Aug 2015 13:24:28 +0000 (14:24 +0100)]
weekly release 3.0dev
David Monllao [Thu, 20 Aug 2015 07:41:07 +0000 (15:41 +0800)]
Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 20 Aug 2015 07:37:13 +0000 (15:37 +0800)]
Merge branch 'MDL-50801_master-unexisting-caption' of git://github.com/dmonllao/moodle
David Monllao [Thu, 20 Aug 2015 07:25:44 +0000 (15:25 +0800)]
MDL-50801 atto_table: Caption node might not be present
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
Andrew Nicols [Thu, 20 Aug 2015 07:15:00 +0000 (15:15 +0800)]
MDL-42634 theme: Increase margin on activity instance to not cover controls
David Monllao [Thu, 20 Aug 2015 04:56:11 +0000 (12:56 +0800)]
MDL-49280 auth: Rewording duplicate emails setting
From allowuserstoshareemailaddresses to allowaccountssameemail, also
changing lang strings.
Damyon Wiese [Wed, 22 Jul 2015 05:02:01 +0000 (13:02 +0800)]
MDL-50150 Mustache: Update to 2.9.0 version of mustache.php
And enable the BLOCKS pragma (we need it for reusable templates).
Damyon Wiese [Thu, 7 May 2015 08:13:22 +0000 (16:13 +0800)]
MDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine.
Pull request: https://github.com/janl/mustache.js/pull/473
David Monllao [Thu, 20 Aug 2015 02:31:20 +0000 (10:31 +0800)]
Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 20 Aug 2015 01:49:22 +0000 (09:49 +0800)]
MDL-50391 mod_lti: Fixing indentation
Eloy Lafuente (stronk7) [Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)]
Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 19 Aug 2015 02:00:13 +0000 (10:00 +0800)]
MDL-42634 theme: Increase margin on sectionname to not cover controls
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 23:04:23 +0000 (01:04 +0200)]
Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 22:59:42 +0000 (00:59 +0200)]
Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:50 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Add unit tests
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:16 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Improve performance
Dan Poltawski [Tue, 18 Aug 2015 13:37:33 +0000 (14:37 +0100)]
Merge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 18 Aug 2015 12:20:01 +0000 (13:20 +0100)]
Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 11:19:41 +0000 (13:19 +0200)]
Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 11:31:56 +0000 (12:31 +0100)]
MDL-46387 shifter: missing built changes
Dan Poltawski [Tue, 18 Aug 2015 11:22:15 +0000 (12:22 +0100)]
Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 18 Aug 2015 10:02:59 +0000 (11:02 +0100)]
Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:54:05 +0000 (09:54 +0100)]
Merge branch 'MDL-50127-master-squashed' of git://github.com/xow/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:29:19 +0000 (09:29 +0100)]
Merge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:28:06 +0000 (09:28 +0100)]
Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle
David Monllao [Tue, 18 Aug 2015 04:09:49 +0000 (12:09 +0800)]
Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle
David Monllao [Tue, 18 Aug 2015 02:18:28 +0000 (10:18 +0800)]
Merge branch 'MDL-51102-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 19 Aug 2015 08:01:42 +0000 (16:01 +0800)]
MDL-50880 message: correctly compare with empty string
Thanks to David Herney Bernal for providing a fix
Simey Lameze [Tue, 18 Aug 2015 04:04:50 +0000 (12:04 +0800)]
MDL-40179 auth_cas: change is_proxybypass parameter to use server url
David Monllao [Thu, 9 Jul 2015 02:06:35 +0000 (12:06 +1000)]
MDL-50801 atto_table: Allow caption position to be set
Adrian Greeve [Tue, 18 Aug 2015 07:22:41 +0000 (15:22 +0800)]
MDL-30315 grades: Fix up function doc block.
This was annoying me no end so here is a commit
to set it right.
Adrian Greeve [Tue, 18 Aug 2015 03:28:24 +0000 (11:28 +0800)]
MDL-30315 grades: Unit tests for grade import.
Adrian Greeve [Fri, 5 Jun 2015 02:49:26 +0000 (10:49 +0800)]
MDL-30315 gradebook: Uploading feedback doesn't override grades.
Andrew Nicols [Fri, 24 Jul 2015 01:09:18 +0000 (09:09 +0800)]
MDL-33365 core: Move JS output to body
It turns out that, after all these years, we've been doing it wrong.
The YUI Loader should be loaded at the top of the body, not in the head.
Having it in the head means that the body has not yet loaded, and we see
a number of minor issues for scripts which happen very early in the load
process. One of these is the creation of invalid HTML from the YUI loader
because it is not able to insert in the body as it has not yet been
created.
To be safe, we must move all JS to the same point (because of unknown
dependencies between them). These should be placed as early in the body as
possible.
We also change the way in which the legacy YUI css modules are loaded.
David Monllao [Wed, 22 Jul 2015 18:29:48 +0000 (20:29 +0200)]
MDL-49085 block_tag_youtube: Using Youtube data api v3
Marina Glancy [Tue, 18 Aug 2015 01:24:45 +0000 (09:24 +0800)]
MDL-50683 user: add default choice
David Monllao [Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)]
Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/base/style/blocks.css
Dan Poltawski [Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)]
Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle
Dan Poltawski [Mon, 17 Aug 2015 14:03:59 +0000 (15:03 +0100)]
Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)]
Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 17 Aug 2015 10:44:57 +0000 (11:44 +0100)]
Merge branch 'MDL-42634-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 17 Aug 2015 07:06:15 +0000 (15:06 +0800)]
Merge branch 'wip-MDL-50303-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)]
Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle