moodle.git
11 years agoMerge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 6 Nov 2013 05:06:01 +0000 (13:06 +0800)]
Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

11 years agoMerge branch '42690-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 6 Nov 2013 04:52:03 +0000 (15:52 +1100)]
Merge branch '42690-26' of git://github.com/samhemelryk/moodle

11 years agoMerge branch '42710-26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Wed, 6 Nov 2013 04:07:47 +0000 (12:07 +0800)]
Merge branch '42710-26' of git://github.com/samhemelryk/moodle

11 years agoMerge branch 'MDL-41232-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Wed, 6 Nov 2013 03:59:41 +0000 (11:59 +0800)]
Merge branch 'MDL-41232-master' of git://github.com/mouneyrac/moodle

11 years agoMDL-40975 Theme: Rebuild of bootstrap css
Andrew Nicols [Tue, 29 Oct 2013 03:26:43 +0000 (11:26 +0800)]
MDL-40975 Theme: Rebuild of bootstrap css

11 years agoMDL-40975 ActionMenu: Adjust how actionmenu is displayed for course management
Andrew Nicols [Tue, 5 Nov 2013 06:58:07 +0000 (14:58 +0800)]
MDL-40975 ActionMenu: Adjust how actionmenu is displayed for course management

11 years agoMDL-40975 course: Adapt behat tests to the new course editing interface
David Monllao [Mon, 4 Nov 2013 11:33:36 +0000 (19:33 +0800)]
MDL-40975 course: Adapt behat tests to the new course editing interface

11 years agoMDL-40975 ActionMenu: Ensure we maintain consistent tab order
Andrew Nicols [Tue, 5 Nov 2013 00:52:00 +0000 (08:52 +0800)]
MDL-40975 ActionMenu: Ensure we maintain consistent tab order

When the actionmenu is open, we should focus on it's first element, and
then naturally tab through it. Tabbing from the end should take us to the
first element after the menu button. This may not be the same as the first
element after the menu itself because of the nature of primary and
secondary action links. We also need to shift-tab back in the same manner.

11 years agoMDL-40975 Theme: Change the actionmenu icons back to 12px
Andrew Nicols [Mon, 4 Nov 2013 07:30:09 +0000 (15:30 +0800)]
MDL-40975 Theme: Change the actionmenu icons back to 12px

11 years agoMDL-40975 ActionMenu: Convert text-based icon to the caret style
Andrew Nicols [Sat, 2 Nov 2013 00:59:57 +0000 (08:59 +0800)]
MDL-40975 ActionMenu: Convert text-based icon to the caret style

11 years agoMDL-42564 Course: Replace group mode icons with larger versions
Barbara Ramiro [Sat, 2 Nov 2013 00:25:41 +0000 (08:25 +0800)]
MDL-42564 Course: Replace group mode icons with larger versions

11 years agoMDL-42564 ActionMenu: Replace actionmenu icon with new style
Barbara Ramiro [Sat, 2 Nov 2013 00:25:22 +0000 (08:25 +0800)]
MDL-42564 ActionMenu: Replace actionmenu icon with new style

11 years agoMDL-40956 Course: AJAX course duplication
Andrew Nicols [Wed, 7 Aug 2013 14:51:56 +0000 (15:51 +0100)]
MDL-40956 Course: AJAX course duplication

11 years agoMDL-40975 Theme: Dim the modicon when an activity is disabled
Andrew Nicols [Thu, 31 Oct 2013 08:33:22 +0000 (16:33 +0800)]
MDL-40975 Theme: Dim the modicon when an activity is disabled

11 years agoMDL-40975 Course: Make the completion tracking look the same as other icons when...
Andrew Nicols [Wed, 30 Oct 2013 08:37:29 +0000 (16:37 +0800)]
MDL-40975 Course: Make the completion tracking look the same as other icons when editing

11 years agoMDL-40975 Course: Move all editing icons to the end of the line
Andrew Nicols [Tue, 29 Oct 2013 07:35:38 +0000 (15:35 +0800)]
MDL-40975 Course: Move all editing icons to the end of the line

11 years agoMDL-40975 ActionMenu: Add support for fillers in primary menus
Andrew Nicols [Wed, 30 Oct 2013 08:29:56 +0000 (16:29 +0800)]
MDL-40975 ActionMenu: Add support for fillers in primary menus

This is required to maintain horizontal alignment of primary menus in rows.

11 years agoMDL-40975 Course: Tidy up icon spacings
Andrew Nicols [Tue, 29 Oct 2013 07:46:27 +0000 (15:46 +0800)]
MDL-40975 Course: Tidy up icon spacings

11 years agoMDL-40975 ActionMenu: Tidy up title + alt combinations
Andrew Nicols [Tue, 29 Oct 2013 07:35:14 +0000 (15:35 +0800)]
MDL-40975 ActionMenu: Tidy up title + alt combinations

11 years agoMDL-40975 Course: Adjust how we handle toolbox processing to improve performance
Andrew Nicols [Tue, 29 Oct 2013 06:20:09 +0000 (14:20 +0800)]
MDL-40975 Course: Adjust how we handle toolbox processing to improve performance

11 years agoMDL-40975 ActionMenu: Change default alignment when opening the menu
Damyon Wiese [Mon, 28 Oct 2013 08:59:31 +0000 (16:59 +0800)]
MDL-40975 ActionMenu: Change default alignment when opening the menu

Committer: Andrew Nicols <andrew@nicols.co.uk>

11 years agoMDL-40975 ActionMenu: Adjust icon placement for text menus
Andrew Nicols [Mon, 28 Oct 2013 08:24:53 +0000 (16:24 +0800)]
MDL-40975 ActionMenu: Adjust icon placement for text menus

11 years agoMDL-40975 Course: Adjust vertical alignment for text menu
Andrew Nicols [Mon, 28 Oct 2013 06:33:33 +0000 (14:33 +0800)]
MDL-40975 Course: Adjust vertical alignment for text menu

11 years agoMDL-40975 Course: Remove groupmode when forced at course level
Andrew Nicols [Mon, 28 Oct 2013 06:29:18 +0000 (14:29 +0800)]
MDL-40975 Course: Remove groupmode when forced at course level

11 years agoMDL-40975 Course: Set the show/hide activity toggle
Andrew Nicols [Mon, 28 Oct 2013 06:10:45 +0000 (14:10 +0800)]
MDL-40975 Course: Set the show/hide activity toggle

11 years agoMDL-40975 Course: Add aria label for dragdrop
Andrew Nicols [Tue, 29 Oct 2013 07:59:47 +0000 (15:59 +0800)]
MDL-40975 Course: Add aria label for dragdrop

11 years agoMDL-40975 Course: Add back JavaScript drag/drop for bootstrap on mobile
Andrew Nicols [Mon, 28 Oct 2013 03:48:59 +0000 (11:48 +0800)]
MDL-40975 Course: Add back JavaScript drag/drop for bootstrap on mobile

11 years agoMDL-40975 JavaScript: Make drag/drop respond to a single click as well as a drag
Andrew Nicols [Sun, 27 Oct 2013 15:34:24 +0000 (23:34 +0800)]
MDL-40975 JavaScript: Make drag/drop respond to a single click as well as a drag

11 years agoMDL-40975 Course: Hide commands when editing titles
Andrew Nicols [Mon, 28 Oct 2013 05:28:18 +0000 (13:28 +0800)]
MDL-40975 Course: Hide commands when editing titles

11 years agoMDL-40975 JavaScript: Standardise the location of the activity spinner
Andrew Nicols [Fri, 25 Oct 2013 10:18:01 +0000 (18:18 +0800)]
MDL-40975 JavaScript: Standardise the location of the activity spinner

11 years agoMDL-40975 ActionMenu: Remove background color when menu is active
Andrew Nicols [Sun, 27 Oct 2013 01:13:02 +0000 (09:13 +0800)]
MDL-40975 ActionMenu: Remove background color when menu is active

11 years agoMDL-40975 Course: Move drag/drop to start of the line
Andrew Nicols [Tue, 29 Oct 2013 01:57:47 +0000 (09:57 +0800)]
MDL-40975 Course: Move drag/drop to start of the line

11 years agoMDL-40975 Course: Change which actions are in the menu and which are outside it
Andrew Nicols [Fri, 25 Oct 2013 06:36:46 +0000 (14:36 +0800)]
MDL-40975 Course: Change which actions are in the menu and which are outside it

11 years agoMDL-40975 Course: Change the activity drag icon to prevent icon flash
Andrew Nicols [Fri, 25 Oct 2013 07:35:54 +0000 (15:35 +0800)]
MDL-40975 Course: Change the activity drag icon to prevent icon flash

11 years agoMDL-42564 Theme: Add new dropdown icons
Barbara Ramiro [Tue, 29 Oct 2013 07:48:24 +0000 (15:48 +0800)]
MDL-42564 Theme: Add new dropdown icons

11 years agoMDL-40975 Theme: Standardise size of icons in headings
Andrew Nicols [Sun, 27 Oct 2013 01:42:00 +0000 (09:42 +0800)]
MDL-40975 Theme: Standardise size of icons in headings

11 years agoMDL-40975 Theme: Tidy up block icons to line up in columns
Andrew Nicols [Thu, 31 Oct 2013 01:53:28 +0000 (09:53 +0800)]
MDL-40975 Theme: Tidy up block icons to line up in columns

11 years agoMDL-40975 Blocks: Move most block actions into the block menu
Andrew Nicols [Fri, 25 Oct 2013 06:14:03 +0000 (14:14 +0800)]
MDL-40975 Blocks: Move most block actions into the block menu

11 years agoMerge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com/skodak/moodle
Damyon Wiese [Wed, 6 Nov 2013 02:21:35 +0000 (10:21 +0800)]
Merge branch 'w45_MDL-42602_m26_userloginevent' of https://github.com/skodak/moodle

11 years agoMDL-40244 forms: added setType() for groupinfo in forum and wiki
Mary Evans [Fri, 1 Nov 2013 23:41:35 +0000 (23:41 +0000)]
MDL-40244 forms: added setType() for groupinfo in forum and wiki

11 years agoMerge branch '42629-26-r2' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 6 Nov 2013 00:56:20 +0000 (11:56 +1100)]
Merge branch '42629-26-r2' of git://github.com/samhemelryk/moodle

11 years agoMerge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle
Marina Glancy [Wed, 6 Nov 2013 00:52:15 +0000 (11:52 +1100)]
Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle

11 years agoML-42629 course: management added can_resort checks
Sam Hemelryk [Wed, 6 Nov 2013 00:49:36 +0000 (08:49 +0800)]
ML-42629 course: management added can_resort checks

11 years agoMDL-42402 EditPDF: CSS fix for hover on drop down menus
Damyon Wiese [Tue, 5 Nov 2013 16:41:04 +0000 (00:41 +0800)]
MDL-42402 EditPDF: CSS fix for hover on drop down menus

Also required a fix for the comment search window because it was picking up the same styles.

11 years agoMerge branch 'MDL-42671-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 5 Nov 2013 16:27:04 +0000 (17:27 +0100)]
Merge branch 'MDL-42671-master' of git://github.com/damyon/moodle

11 years agoMDL-42671 EditPDF: Disable EditPDF is zlib is not available
Damyon Wiese [Tue, 5 Nov 2013 15:30:28 +0000 (23:30 +0800)]
MDL-42671 EditPDF: Disable EditPDF is zlib is not available

Also put a warning on the admin page if this is the case.

11 years agoMerge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 5 Nov 2013 14:44:53 +0000 (22:44 +0800)]
Merge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle

Conflicts:
version.php

11 years agoMDL-42719 course: management view mode wrap fixed
Sam Hemelryk [Tue, 5 Nov 2013 13:51:28 +0000 (21:51 +0800)]
MDL-42719 course: management view mode wrap fixed

11 years agoMDL-42710 course: management cat sorting perfecting taking place
Sam Hemelryk [Tue, 5 Nov 2013 07:59:33 +0000 (15:59 +0800)]
MDL-42710 course: management cat sorting perfecting taking place

11 years agoMerge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 5 Nov 2013 09:25:53 +0000 (17:25 +0800)]
Merge branch 'MDL-42332-fix-modal-window' of git://github.com/dmonllao/moodle

11 years agoMDL-42332 behat: Adding a wait to let AJAX finish the request
David Monllao [Tue, 5 Nov 2013 09:13:20 +0000 (17:13 +0800)]
MDL-42332 behat: Adding a wait to let AJAX finish the request

The Mark as completed performs an AJAX request,
we need to give time to let it finish.

11 years agoMerge branch 'MDL-42613_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 5 Nov 2013 08:39:27 +0000 (16:39 +0800)]
Merge branch 'MDL-42613_master' of https://github.com/markn86/moodle

11 years agoMDL-42629: Fixing dodgy merge conflict (oops)
Damyon Wiese [Tue, 5 Nov 2013 08:35:57 +0000 (16:35 +0800)]
MDL-42629: Fixing dodgy merge conflict (oops)

11 years agoMerge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 5 Nov 2013 07:52:48 +0000 (15:52 +0800)]
Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle

11 years agoMDL-42363 behat: Avoid random failure because of timing differences
David Monllao [Tue, 5 Nov 2013 07:27:13 +0000 (15:27 +0800)]
MDL-42363 behat: Avoid random failure because of timing differences

11 years agoMerge branch 'MDL-42402-master-fix2' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 5 Nov 2013 07:06:36 +0000 (15:06 +0800)]
Merge branch 'MDL-42402-master-fix2' of git://github.com/damyon/moodle

11 years agoMDL-42402 EditPDF: Make the colours match the mockup in MDL-41633
Damyon Wiese [Tue, 5 Nov 2013 06:49:06 +0000 (14:49 +0800)]
MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633

11 years agoMerge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 5 Nov 2013 06:44:53 +0000 (17:44 +1100)]
Merge branch 'MDL-40267-master' of git://github.com/danpoltawski/moodle

11 years agoMerge branch 'MDL-42706-master-int' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 5 Nov 2013 06:13:38 +0000 (17:13 +1100)]
Merge branch 'MDL-42706-master-int' of git://github.com/FMCorz/moodle

11 years agoMerge branch '42629-26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 5 Nov 2013 06:04:08 +0000 (14:04 +0800)]
Merge branch '42629-26' of git://github.com/samhemelryk/moodle

Conflicts:
course/classes/management_renderer.php

11 years agoMDL-42629 course: management peer-review alterations
Sam Hemelryk [Tue, 5 Nov 2013 03:08:16 +0000 (11:08 +0800)]
MDL-42629 course: management peer-review alterations

* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus

11 years agoMDL-42706 mod_book: Undefined CFG in pluginfile function
Frederic Massart [Tue, 5 Nov 2013 05:19:42 +0000 (13:19 +0800)]
MDL-42706 mod_book: Undefined CFG in pluginfile function

11 years agoMerge branch 'MDL-42701' of git://github.com/stronk7/moodle
Damyon Wiese [Tue, 5 Nov 2013 05:10:52 +0000 (13:10 +0800)]
Merge branch 'MDL-42701' of git://github.com/stronk7/moodle

11 years agoMerge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 5 Nov 2013 04:34:35 +0000 (12:34 +0800)]
Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle

11 years agoMerge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle
Damyon Wiese [Tue, 5 Nov 2013 04:24:41 +0000 (12:24 +0800)]
Merge branch 'wip-mdl-42703-master' of https://github.com/deraadt/moodle

11 years agoMDL-42280 Behat: add behat test for block settings.
rwijaya [Tue, 29 Oct 2013 04:30:14 +0000 (12:30 +0800)]
MDL-42280 Behat: add behat test for block settings.

Test includes: modifying setting to hide and move block appearance

11 years agoMerge branch 'MDL-42476' of https://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 5 Nov 2013 03:24:02 +0000 (11:24 +0800)]
Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle

11 years agoMDL-38228 upgrade: Rewrite and re-apply script that fixes corrupt course modules...
Marina Glancy [Wed, 30 Oct 2013 00:52:50 +0000 (11:52 +1100)]
MDL-38228 upgrade: Rewrite and re-apply script that fixes corrupt course modules to sequence relation

11 years agoMerge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 5 Nov 2013 03:06:23 +0000 (11:06 +0800)]
Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle

11 years agoMDL-42703 Course: Remove alias from queries to satisfy MSSQL
Michael de Raadt [Tue, 5 Nov 2013 02:52:24 +0000 (10:52 +0800)]
MDL-42703 Course: Remove alias from queries to satisfy MSSQL

11 years agoMDL-42265 make Browse Users list scrollable for smaller screens
Ray Morris [Thu, 10 Oct 2013 20:05:38 +0000 (15:05 -0500)]
MDL-42265 make Browse Users list scrollable for smaller screens

11 years agoMDL-42402 EditPDF: Fix the styles again
Damyon Wiese [Tue, 5 Nov 2013 02:27:38 +0000 (10:27 +0800)]
MDL-42402 EditPDF: Fix the styles again

More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.

11 years agoMDL-40267 forms: fix utf8 string length rules
Dan Poltawski [Tue, 5 Nov 2013 02:03:16 +0000 (10:03 +0800)]
MDL-40267 forms: fix utf8 string length rules

11 years agoMDL-40267 forms: added some tests for the range rule
Eloy Lafuente (stronk7) [Mon, 4 Nov 2013 23:32:50 +0000 (00:32 +0100)]
MDL-40267 forms: added some tests for the range rule

11 years agoMDL-42464 mod_chat: Correct use of amp; in session link
Andrew Nicols [Tue, 5 Nov 2013 00:57:31 +0000 (08:57 +0800)]
MDL-42464 mod_chat: Correct use of amp; in session link

11 years agoMDL-42629 course: management resorting improvements
Sam Hemelryk [Mon, 4 Nov 2013 04:19:11 +0000 (12:19 +0800)]
MDL-42629 course: management resorting improvements

11 years agoMDL-42629 course: set a better management page title
Sam Hemelryk [Thu, 31 Oct 2013 07:21:26 +0000 (15:21 +0800)]
MDL-42629 course: set a better management page title

11 years agoMDL-42629 course: changed new course to create new course
Sam Hemelryk [Thu, 31 Oct 2013 07:10:25 +0000 (15:10 +0800)]
MDL-42629 course: changed new course to create new course

11 years agoMDL-42629 course: moving a course now updates counts and pagination totals
Sam Hemelryk [Thu, 31 Oct 2013 07:07:46 +0000 (15:07 +0800)]
MDL-42629 course: moving a course now updates counts and pagination totals

11 years agoMDL-42629 course: changed sub category to subcategory
Sam Hemelryk [Thu, 31 Oct 2013 06:40:27 +0000 (14:40 +0800)]
MDL-42629 course: changed sub category to subcategory

11 years agoMDL-42629 actionmenu: alt and title on icon removed if the same as text being displayed
Sam Hemelryk [Thu, 31 Oct 2013 06:29:26 +0000 (14:29 +0800)]
MDL-42629 actionmenu: alt and title on icon removed if the same as text being displayed

11 years agoMDL-42629 course: fixed up create category management actions
Sam Hemelryk [Thu, 31 Oct 2013 06:21:54 +0000 (14:21 +0800)]
MDL-42629 course: fixed up create category management actions

11 years agoMDL-42629 course: renamed re-sort to sort
Sam Hemelryk [Thu, 31 Oct 2013 05:58:43 +0000 (13:58 +0800)]
MDL-42629 course: renamed re-sort to sort

11 years agoMDL-42629 course: tweaks CSS for management interface
Sam Hemelryk [Thu, 31 Oct 2013 05:49:33 +0000 (13:49 +0800)]
MDL-42629 course: tweaks CSS for management interface

* Removed grey background from checkboxes and bulk actions.
* Removed blue colouring on subheadings.
* Changed greys to the clean theme greys

11 years agoMDL-42629 course: improved wording on move course dialogue
Sam Hemelryk [Thu, 31 Oct 2013 05:36:00 +0000 (13:36 +0800)]
MDL-42629 course: improved wording on move course dialogue

11 years agoMDL-42300 course: improved category re-sort controls.
Sam Hemelryk [Tue, 15 Oct 2013 04:59:30 +0000 (17:59 +1300)]
MDL-42300 course: improved category re-sort controls.

* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.

11 years agoMDL-42701 Bump main version to observe all deps
Eloy Lafuente (stronk7) [Tue, 5 Nov 2013 01:37:19 +0000 (02:37 +0100)]
MDL-42701 Bump main version to observe all deps

11 years agoMDL-42701 Bump all versions near 2.6 release
Eloy Lafuente (stronk7) [Tue, 5 Nov 2013 01:36:00 +0000 (02:36 +0100)]
MDL-42701 Bump all versions near 2.6 release

11 years agoMerge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 5 Nov 2013 01:31:41 +0000 (09:31 +0800)]
Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle

11 years agoMerge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 4 Nov 2013 15:40:33 +0000 (23:40 +0800)]
Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle

11 years agoMerge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Nov 2013 15:34:18 +0000 (23:34 +0800)]
Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle

11 years agoMerge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle
Dan Poltawski [Mon, 4 Nov 2013 14:54:09 +0000 (22:54 +0800)]
Merge branch 'wip-MDL-42270_master_2' of git://github.com/gjb2048/moodle

11 years agoMerge branch 'MDL-42548' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 4 Nov 2013 14:34:27 +0000 (22:34 +0800)]
Merge branch 'MDL-42548' of git://github.com/timhunt/moodle

11 years agoMerge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 4 Nov 2013 14:31:55 +0000 (22:31 +0800)]
Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle

11 years agoMerge branch 'MDL-42592_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 4 Nov 2013 14:27:49 +0000 (22:27 +0800)]
Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle

11 years agoMerge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 4 Nov 2013 14:17:19 +0000 (22:17 +0800)]
Merge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle

11 years agoMDL-42533 conditionlib: Add clarifying comments
Dan Poltawski [Mon, 4 Nov 2013 14:01:18 +0000 (22:01 +0800)]
MDL-42533 conditionlib: Add clarifying comments

11 years agoMerge branch 'MDL-42533-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 4 Nov 2013 13:51:57 +0000 (21:51 +0800)]
Merge branch 'MDL-42533-master' of git://github.com/FMCorz/moodle

11 years agoMerge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 4 Nov 2013 12:10:24 +0000 (20:10 +0800)]
Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle

Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js

11 years agoMerge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 4 Nov 2013 11:35:01 +0000 (19:35 +0800)]
Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle