moodle.git
8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 years agoMerge branch '42350-26' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 4 Nov 2013 09:21:29 +0000 (17:21 +0800)]
Merge branch '42350-26' of git://github.com/samhemelryk/moodle

8 years agoMDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on activi...
Jerome Mouneyrac [Thu, 24 Oct 2013 03:43:04 +0000 (11:43 +0800)]
MDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on activity and course completion + add i_trigger_cron behat step

8 years agoMDL-42331 Automate MDLQA-5258 - A teacher can add and allocate a course badge
Jerome Mouneyrac [Tue, 22 Oct 2013 07:22:09 +0000 (15:22 +0800)]
MDL-42331 Automate MDLQA-5258 - A teacher can add and allocate a course badge

8 years agoMerge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 4 Nov 2013 08:44:54 +0000 (16:44 +0800)]
Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 4 Nov 2013 08:39:39 +0000 (16:39 +0800)]
Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle

Conflicts:
lib/upgrade.txt

8 years agoMDL-42631 Filepicker: swap the alt attribute to a title attribute to help usability
Jason Fowler [Fri, 1 Nov 2013 00:44:10 +0000 (08:44 +0800)]
MDL-42631 Filepicker: swap the alt attribute to a title attribute to help usability

8 years agoMDL-41849 Quiz: Quiz send mail from noreply user
Rajesh Taneja [Mon, 4 Nov 2013 08:29:55 +0000 (16:29 +0800)]
MDL-41849 Quiz: Quiz send mail from noreply user

Mails should be send by noreply user and not admin user

8 years agoMerge branch 'MDL-42551' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 4 Nov 2013 08:21:25 +0000 (16:21 +0800)]
Merge branch 'MDL-42551' of git://github.com/stronk7/moodle

8 years agoMDL-42330 Automate MDLQA-5257 - An admin can award a site badge
Jerome Mouneyrac [Mon, 21 Oct 2013 05:45:12 +0000 (13:45 +0800)]
MDL-42330 Automate MDLQA-5257 - An admin can award a site badge

8 years agoMerge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 4 Nov 2013 08:16:23 +0000 (19:16 +1100)]
Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 4 Nov 2013 08:14:04 +0000 (16:14 +0800)]
Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle

8 years agoMDL-42147 filepicker: fixed dialog box css issue on IE9.
rwijaya [Mon, 4 Nov 2013 04:00:57 +0000 (12:00 +0800)]
MDL-42147 filepicker: fixed dialog box css issue on IE9.

This patch fix the following issue repository icon size, dialog title bar background color and rounded corner for dialog box.

Conflicts:

theme/bootstrapbase/style/moodle.css

8 years agoMDL-42537 calendar: locale charset on windows will come from calendartype
Rajesh Taneja [Fri, 1 Nov 2013 07:55:17 +0000 (15:55 +0800)]
MDL-42537 calendar: locale charset on windows will come from calendartype

date_format_string() will now convert date on windows based on calendar type used

8 years agoMDL-42287 behat: Use string from scorm content, instead of scorm structure
Ankit Agarwal [Mon, 4 Nov 2013 05:00:23 +0000 (13:00 +0800)]
MDL-42287 behat: Use string from scorm content, instead of scorm structure

8 years agoMDL-42350 assign: Test group submission + drafts
Damyon Wiese [Mon, 4 Nov 2013 05:41:51 +0000 (13:41 +0800)]
MDL-42350 assign: Test group submission + drafts

8 years agoMDL-42350 mod_assign: fixed display of submission button
Sam Hemelryk [Thu, 31 Oct 2013 03:05:16 +0000 (11:05 +0800)]
MDL-42350 mod_assign: fixed display of submission button

8 years agoMDL-42111 fix trailing whitespace
Dan Poltawski [Mon, 4 Nov 2013 07:35:19 +0000 (15:35 +0800)]
MDL-42111 fix trailing whitespace

8 years agoMerge branch 'MDL-42111' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 4 Nov 2013 07:32:34 +0000 (15:32 +0800)]
Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-42512 finally fix the indentation of filter management page
Petr Škoda [Mon, 4 Nov 2013 07:28:51 +0000 (08:28 +0100)]
MDL-42512 finally fix the indentation of filter management page

8 years agoMDL-42512 fix and cleanup filter management page
Petr Škoda [Thu, 24 Oct 2013 20:41:02 +0000 (22:41 +0200)]
MDL-42512 fix and cleanup filter management page

8 years agoMerge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Mon, 4 Nov 2013 07:22:43 +0000 (15:22 +0800)]
Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 4 Nov 2013 06:51:16 +0000 (14:51 +0800)]
Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-42429_master' of https://github.com/markn86/moodle
Marina Glancy [Mon, 4 Nov 2013 06:27:57 +0000 (17:27 +1100)]
Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 4 Nov 2013 06:24:46 +0000 (14:24 +0800)]
Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42566_master' of https://github.com/markn86/moodle
Marina Glancy [Mon, 4 Nov 2013 06:22:45 +0000 (17:22 +1100)]
Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle

8 years agoMDL-42286 fix trailing whitespace
Dan Poltawski [Mon, 4 Nov 2013 06:14:30 +0000 (14:14 +0800)]
MDL-42286 fix trailing whitespace

8 years agoMerge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 4 Nov 2013 06:13:27 +0000 (14:13 +0800)]
Merge branch 'MDL-42286_behat' of https://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 4 Nov 2013 06:00:30 +0000 (14:00 +0800)]
Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle

8 years agoMDL-41807 repository_filesystem: Coding style clean up
Frederic Massart [Tue, 24 Sep 2013 06:49:04 +0000 (14:49 +0800)]
MDL-41807 repository_filesystem: Coding style clean up

8 years agoMDL-41807 repository_filesystem: Prevent access to parent directories
Frederic Massart [Tue, 24 Sep 2013 05:42:11 +0000 (13:42 +0800)]
MDL-41807 repository_filesystem: Prevent access to parent directories

8 years agoMerge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 4 Nov 2013 05:17:15 +0000 (13:17 +0800)]
Merge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-42617' of git://github.com/jleyva/moodle
Marina Glancy [Mon, 4 Nov 2013 05:14:35 +0000 (16:14 +1100)]
Merge branch 'MDL-42617' of git://github.com/jleyva/moodle

8 years agoMerge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 4 Nov 2013 05:11:42 +0000 (13:11 +0800)]
Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 4 Nov 2013 04:59:27 +0000 (15:59 +1100)]
Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-42402-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 4 Nov 2013 04:53:22 +0000 (15:53 +1100)]
Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)]
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38664' of git://github.com/rwijaya/moodle
Marina Glancy [Mon, 4 Nov 2013 04:13:42 +0000 (15:13 +1100)]
Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-40515' of git://github.com/aolley/moodle
Dan Poltawski [Mon, 4 Nov 2013 04:10:39 +0000 (12:10 +0800)]
Merge branch 'MDL-40515' of git://github.com/aolley/moodle

8 years agoMerge branch 'MDL-35146_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 4 Nov 2013 03:53:40 +0000 (11:53 +0800)]
Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle

8 years agoMDL-41941 clean message text
Petr Škoda [Tue, 8 Oct 2013 16:38:31 +0000 (18:38 +0200)]
MDL-41941 clean message text

8 years agoMerge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 4 Nov 2013 03:33:04 +0000 (11:33 +0800)]
Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle

8 years agoMDL-40874 Retire MyMobile as a standard theme
Jerome Mouneyrac [Mon, 4 Nov 2013 03:11:46 +0000 (14:11 +1100)]
MDL-40874 Retire MyMobile as a standard theme

8 years agoMDL-41820 XSS in the quiz responses report.
Tim Hunt [Tue, 17 Sep 2013 17:26:53 +0000 (18:26 +0100)]
MDL-41820 XSS in the quiz responses report.

Thanks to Michael Hess for finding this bug and reporting it to us.

8 years agoMerge branch 'MDL-42521_master' of git://github.com/grabs/moodle
Damyon Wiese [Mon, 4 Nov 2013 02:56:12 +0000 (10:56 +0800)]
Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle

8 years agoMerge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 4 Nov 2013 02:49:06 +0000 (10:49 +0800)]
Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch '42452-26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 4 Nov 2013 02:37:59 +0000 (10:37 +0800)]
Merge branch '42452-26' of git://github.com/samhemelryk/moodle

8 years agoMDL-42452 actionmenu: improved constraint code
Sam Hemelryk [Mon, 4 Nov 2013 02:22:18 +0000 (10:22 +0800)]
MDL-42452 actionmenu: improved constraint code

8 years agoMerge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com...
Marina Glancy [Mon, 4 Nov 2013 02:17:58 +0000 (13:17 +1100)]
Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 4 Nov 2013 01:52:15 +0000 (12:52 +1100)]
Merge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-38850' of git://github.com/rwijaya/moodle
Damyon Wiese [Mon, 4 Nov 2013 01:38:38 +0000 (09:38 +0800)]
Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle

8 years agoMDL-42452 ActionMenu: Change constrains mechanism to show the entire menu
Andrew Nicols [Sat, 2 Nov 2013 00:51:19 +0000 (08:51 +0800)]
MDL-42452 ActionMenu: Change constrains mechanism to show the entire menu

8 years agoMDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme
Andreas Grabs [Sun, 3 Nov 2013 18:11:27 +0000 (19:11 +0100)]
MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme

8 years agoMDL-42452 block: action menu is now constrained to the block container
Sam Hemelryk [Thu, 31 Oct 2013 07:54:16 +0000 (15:54 +0800)]
MDL-42452 block: action menu is now constrained to the block container

8 years agoMerge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Sat, 2 Nov 2013 14:39:37 +0000 (22:39 +0800)]
Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle
Damyon Wiese [Sat, 2 Nov 2013 14:34:16 +0000 (22:34 +0800)]
Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle

8 years agoMerge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle
Damyon Wiese [Sat, 2 Nov 2013 14:24:19 +0000 (22:24 +0800)]
Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle

8 years agoMDL-42648 lib: Clean theme throws exception if set_pagelayout is called too late.
Mary Evans [Sat, 2 Nov 2013 00:43:48 +0000 (00:43 +0000)]
MDL-42648 lib: Clean theme throws exception if set_pagelayout is called too late.

8 years agoMerge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Fri, 1 Nov 2013 13:31:57 +0000 (21:31 +0800)]
Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle

Conflicts:
version.php