moodle.git
6 years agoMerge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'MDL-45841' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 1 Sep 2015 09:14:45 +0000 (10:14 +0100)]
Merge branch 'MDL-45841' of git://github.com/timhunt/moodle

6 years agoMerge branch 'wip-mdl-50963' of git://github.com/rajeshtaneja/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

6 years agoMDL-51179 editor_atto: Updating since tag to only 3.0
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.

6 years agoMerge branch 'MDL-51179-master' of git://github.com/damyon/moodle
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

6 years agoMDL-50963 behat: fixed error string in behat
rajesh Taneja [Tue, 1 Sep 2015 06:43:52 +0000 (14:43 +0800)]
MDL-50963 behat: fixed error string in behat

6 years agoMerge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 1 Sep 2015 06:35:18 +0000 (14:35 +0800)]
Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-51013 themes: Info about new navbar_button function
David Monllao [Tue, 1 Sep 2015 04:32:00 +0000 (12:32 +0800)]
MDL-51013 themes: Info about new navbar_button function

6 years agoMDL-51013 themes: Suppress navbar button when custom menu is empty
Kevin Wiliarty [Thu, 6 Aug 2015 04:16:19 +0000 (00:16 -0400)]
MDL-51013 themes: Suppress navbar button when custom menu is empty

6 years agoMDL-51179 Atto: Extend autosave fix to cover text changes
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.

6 years agoMerge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'mdl-50963' of https://github.com/cdsmith-umn/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

6 years agoMerge branch 'MDL-49536-master' of git://github.com/ryanwyllie/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

6 years agoMerge branch 'MDL-50677-master' of git://github.com/FMCorz/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

6 years agoMDL-25451 roles: check if user can assign foles in block
Marina Glancy [Thu, 6 Aug 2015 02:19:55 +0000 (10:19 +0800)]
MDL-25451 roles: check if user can assign foles in block

6 years agoMerge branch 'MDL-51131-master' of git://github.com/marinaglancy/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

6 years agoMerge branch 'MDL-51084-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

6 years agoMerge branch 'MDL-51181-m' of git://github.com/micaherne/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

6 years agoMerge branch 'MDL-51215-master' of git://github.com/marinaglancy/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

6 years agoMDL-51229 theme: display docked block on top of fixed navbar
Kevin Wiliarty [Thu, 27 Aug 2015 15:59:14 +0000 (11:59 -0400)]
MDL-51229 theme: display docked block on top of fixed navbar

6 years agoMDL-51084 tool_customlang: return to the same page after submit
Marina Glancy [Wed, 12 Aug 2015 06:12:09 +0000 (14:12 +0800)]
MDL-51084 tool_customlang: return to the same page after submit

6 years agoweekly release 3.0dev
Dan Poltawski [Fri, 28 Aug 2015 06:38:07 +0000 (07:38 +0100)]
weekly release 3.0dev

6 years agoMDL-51179 Atto: Add a behat test for autosave
Damyon Wiese [Fri, 28 Aug 2015 04:09:34 +0000 (12:09 +0800)]
MDL-51179 Atto: Add a behat test for autosave

6 years agoMDL-49536 theme_clean: logo only on front and login
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.

6 years agoMDL-49826 grade: hide singleview links when no permissions
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.

6 years agoMerge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle
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

6 years agoMDL-50677 user: Prefix custom fields node name in profile tree
Frederic Massart [Thu, 27 Aug 2015 09:28:02 +0000 (17:28 +0800)]
MDL-50677 user: Prefix custom fields node name in profile tree

6 years agoMDL-51215 course: redirect to manage appropriate category
Marina Glancy [Thu, 27 Aug 2015 03:02:45 +0000 (11:02 +0800)]
MDL-51215 course: redirect to manage appropriate category

6 years agoMDL-51148 tool_langimport: Use the amended string in Behat test
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

6 years agoMDL-51148 lang: Merge English strings from the en_fix language pack
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

6 years agoMDL-51179 Atto: When a resume is aborted - create a fresh draft for future saves.
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.

6 years agoMerge branch 'wip_MDL-50869_master' of git://github.com/gjb2048/moodle
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

6 years agoMDL-50923 themes: content-only class added before region-only
Marina Glancy [Wed, 26 Aug 2015 01:32:07 +0000 (09:32 +0800)]
MDL-50923 themes: content-only class added before region-only

6 years agoMerge branch 'wip-MDL-50923-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'wip-MDL-27177-master' of git://github.com/abgreeve/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

6 years agoMDL-51179 Atto: Abort autosave if there are more recent changes to the files
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.

6 years agoMerge branch 'MDL-50933' of git://github.com/timhunt/moodle
David Monllao [Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)]
Merge branch 'MDL-50933' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-50996' 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

6 years agoMerge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/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

6 years agoMerge branch 'mdl-50957' of git://github.com/cdsmith-umn/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

6 years agoMDL-27177 roles: Update to behat full profile tests.
Adrian Greeve [Fri, 14 Aug 2015 01:25:32 +0000 (09:25 +0800)]
MDL-27177 roles: Update to behat full profile tests.

6 years agoMDL-27177 roles: Unit test for newly created function.
Adrian Greeve [Wed, 10 Jun 2015 08:32:13 +0000 (16:32 +0800)]
MDL-27177 roles: Unit test for newly created function.

6 years agoMDL-27177 roles: Allow students to see co-students profiles.
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.

6 years agoMerge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle
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

6 years agoMDL-45841 forum: show unread posts on blog-style forum front page
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

6 years agoMerge branch 'MDL-49701' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)]
Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle

6 years agoMDL-50957 grade/report/user: Fix division by zero
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.

6 years agoMDL-50723 upgrade.txt: Note dropped unused table
Dan Poltawski [Mon, 24 Aug 2015 13:51:58 +0000 (14:51 +0100)]
MDL-50723 upgrade.txt: Note dropped unused table

Just in case..

6 years agoMerge branch 'MDL-50723-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 24 Aug 2015 13:47:25 +0000 (14:47 +0100)]
Merge branch 'MDL-50723-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-40179-master' of git://github.com/lameze/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

6 years agoMerge branch 'wip-MDL-27859-master' of https://github.com/marinaglancy/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

6 years agoMerge branch 'MDL-49826_grade_single_view' of git://github.com/davosmith/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

6 years agoMerge branch 'MDL-47450-master' of git://github.com/FMCorz/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

6 years agoMDL-50996 quiz: fix review error with unusual permissions
Tim Hunt [Tue, 4 Aug 2015 16:26:12 +0000 (17:26 +0100)]
MDL-50996 quiz: fix review error with unusual permissions

6 years agoMDL-51181 config: Correct documentation of lock_factory
Michael Aherne [Mon, 24 Aug 2015 08:06:26 +0000 (09:06 +0100)]
MDL-51181 config: Correct documentation of lock_factory

6 years agoMerge branch 'MDL-50958-master' of git://github.com/lameze/moodle
David Monllao [Mon, 24 Aug 2015 07:40:10 +0000 (15:40 +0800)]
Merge branch 'MDL-50958-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-51184-master' of git://github.com/marinaglancy/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

6 years agoMDL-51184 themes: correctly check $CFG->svgicons
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

6 years agoMDL-51116 Mustache: Caching issue exists with mustache templates
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.

6 years agoMDL-50958 block_messages: declare missing stdClass object
Bruce Silver [Mon, 3 Aug 2015 17:37:39 +0000 (18:37 +0100)]
MDL-50958 block_messages: declare missing stdClass object

6 years agoMerge branch 'wip-MDL-51087-master' of git://github.com/marinaglancy/moodle
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

6 years agoMDL-51131 tags: remove instances when course is deleted
Marina Glancy [Sat, 22 Aug 2015 13:45:06 +0000 (21:45 +0800)]
MDL-51131 tags: remove instances when course is deleted

6 years agoMDL-50933 quiz: improve completion behat tests
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.

6 years agoMDL-27859 tags: unit test for tag cleanup
Marina Glancy [Sun, 16 Aug 2015 11:52:27 +0000 (19:52 +0800)]
MDL-27859 tags: unit test for tag cleanup

6 years agoMDL-27859 tags: unit test for correlated tags
Marina Glancy [Sun, 16 Aug 2015 10:49:52 +0000 (18:49 +0800)]
MDL-27859 tags: unit test for correlated tags

6 years agoMDL-50714 mod_forum: Add tests for all groupmodes
Andrew Nicols [Wed, 12 Aug 2015 05:42:35 +0000 (13:42 +0800)]
MDL-50714 mod_forum: Add tests for all groupmodes

6 years agoMDL-50714 mod_forum: Correct use of movedicussions cap when posting
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.

6 years agoMDL-50869 themes: Quiz feedback colours are not accessible.
Gareth J Barnard [Thu, 23 Jul 2015 16:06:21 +0000 (17:06 +0100)]
MDL-50869 themes: Quiz feedback colours are not accessible.

6 years agoMDL-49826 gradereport_singleview: fix permission check
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.

6 years agoweekly release 3.0dev
Dan Poltawski [Thu, 20 Aug 2015 13:24:28 +0000 (14:24 +0100)]
weekly release 3.0dev

6 years agoMerge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle
David Monllao [Thu, 20 Aug 2015 07:41:07 +0000 (15:41 +0800)]
Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-50801_master-unexisting-caption' of git://github.com/dmonllao/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

6 years agoMDL-50801 atto_table: Caption node might not be present
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.

6 years agoMDL-42634 theme: Increase margin on activity instance to not cover controls
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

6 years agoMDL-49280 auth: Rewording duplicate emails setting
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.

6 years agoMDL-50150 Mustache: Update to 2.9.0 version of mustache.php
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).

6 years agoMDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine.
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

6 years agoMerge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 20 Aug 2015 02:31:20 +0000 (10:31 +0800)]
Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-50391 mod_lti: Fixing indentation
David Monllao [Thu, 20 Aug 2015 01:49:22 +0000 (09:49 +0800)]
MDL-50391 mod_lti: Fixing indentation

6 years agoMerge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
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

6 years agoMDL-42634 theme: Increase margin on sectionname to not cover controls
Andrew Nicols [Wed, 19 Aug 2015 02:00:13 +0000 (10:00 +0800)]
MDL-42634 theme: Increase margin on sectionname to not cover controls

6 years agoMerge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle
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

6 years agoMerge branch 'MDL-46078-master' of git://github.com/damyon/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

6 years agoMDL-41944 block_onlines_users: Add unit tests
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:50 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Add unit tests

6 years agoMDL-41944 block_onlines_users: Improve performance
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:16 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Improve performance

6 years agoMerge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/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

6 years agoMerge branch 'MDL-47449-master' of git://github.com/andrewnicols/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

6 years agoMDL-46387 shifter: missing built changes
Dan Poltawski [Tue, 18 Aug 2015 11:31:56 +0000 (12:31 +0100)]
MDL-46387 shifter: missing built changes

6 years agoMerge branch 'MDL-46387-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 18 Aug 2015 11:22:15 +0000 (12:22 +0100)]
Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle

6 years agoMerge branch 'MDL-49841-master' of git://github.com/andrewnicols/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

6 years agoMerge branch 'MDL-50127-master-squashed' of git://github.com/xow/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

6 years agoMerge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/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

6 years agoMerge branch 'MDL-46167-master' of https://github.com/mackensen/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

6 years agoMerge branch 'MDL-50391-master' of git://github.com/aspark21/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

6 years agoMerge branch 'MDL-51102-master' of git://github.com/andrewnicols/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

6 years agoMDL-50880 message: correctly compare with empty string
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

6 years agoMDL-40179 auth_cas: change is_proxybypass parameter to use server url
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

6 years agoMDL-50801 atto_table: Allow caption position to be set
David Monllao [Thu, 9 Jul 2015 02:06:35 +0000 (12:06 +1000)]
MDL-50801 atto_table: Allow caption position to be set

6 years agoMDL-30315 grades: Fix up function doc block.
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.