moodle.git
8 years agoMDL-41398 bootstrap: added a maintenance layout
Sam Hemelryk [Tue, 1 Oct 2013 04:06:16 +0000 (17:06 +1300)]
MDL-41398 bootstrap: added a maintenance layout

8 years agoMerge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Oct 2013 04:21:50 +0000 (14:21 +1000)]
Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle

8 years agoMDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
Damyon Wiese [Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)]
MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)

8 years agoMDL-41828 mod: fixed navbar when adding modules to a course
Sam Hemelryk [Tue, 17 Sep 2013 20:21:32 +0000 (08:21 +1200)]
MDL-41828 mod: fixed navbar when adding modules to a course

8 years agoMDL-41900 events: avoid new debug call within unit tests
Sam Hemelryk [Tue, 1 Oct 2013 03:20:57 +0000 (16:20 +1300)]
MDL-41900 events: avoid new debug call within unit tests

8 years agoMerge branch 'MDL-41995_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 1 Oct 2013 01:50:53 +0000 (14:50 +1300)]
Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-41900-m' of git://github.com/micaherne/moodle
Sam Hemelryk [Tue, 1 Oct 2013 01:35:49 +0000 (14:35 +1300)]
Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle

8 years agoMerge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 1 Oct 2013 01:06:28 +0000 (14:06 +1300)]
Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle

8 years agoMerge branch 'MDL-41241-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 1 Oct 2013 00:58:17 +0000 (13:58 +1300)]
Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js

8 years agoMerge branch 'MDL-41894-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 1 Oct 2013 00:45:18 +0000 (13:45 +1300)]
Merge branch 'MDL-41894-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-41228_master' of https://github.com/totara/openbadges
Sam Hemelryk [Tue, 1 Oct 2013 00:37:44 +0000 (13:37 +1300)]
Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges

8 years agoMerge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 00:14:23 +0000 (02:14 +0200)]
Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle

8 years agoMerge branch '41988-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 1 Oct 2013 00:01:17 +0000 (10:01 +1000)]
Merge branch '41988-26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 23:52:53 +0000 (01:52 +0200)]
Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 30 Sep 2013 23:07:22 +0000 (12:07 +1300)]
Merge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle
Sam Hemelryk [Mon, 30 Sep 2013 22:18:14 +0000 (11:18 +1300)]
Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle

8 years agoMerge branch 'MDL-40572_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 30 Sep 2013 22:05:59 +0000 (11:05 +1300)]
Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges

8 years agoMDL-41988 behat: improvements to spin
Sam Hemelryk [Thu, 26 Sep 2013 01:31:52 +0000 (13:31 +1200)]
MDL-41988 behat: improvements to spin

8 years agoMerge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 30 Sep 2013 21:17:13 +0000 (10:17 +1300)]
Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 30 Sep 2013 21:14:04 +0000 (10:14 +1300)]
Merge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 30 Sep 2013 20:54:26 +0000 (09:54 +1300)]
Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle

8 years agoMerge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 19:55:41 +0000 (21:55 +0200)]
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 14:01:38 +0000 (16:01 +0200)]
Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 30 Sep 2013 08:04:38 +0000 (18:04 +1000)]
Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 30 Sep 2013 07:57:30 +0000 (17:57 +1000)]
Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle

Conflicts:
mod/upgrade.txt

8 years agoMDL-40248 mod: Allow xxx_get_types() to use default display
Mark Nielsen [Tue, 27 Aug 2013 16:11:44 +0000 (09:11 -0700)]
MDL-40248 mod: Allow xxx_get_types() to use default display

* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt

8 years agoMerge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle
Marina Glancy [Mon, 30 Sep 2013 06:09:40 +0000 (16:09 +1000)]
Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-16464' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 30 Sep 2013 03:34:51 +0000 (16:34 +1300)]
Merge branch 'MDL-16464' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Sep 2013 03:15:53 +0000 (16:15 +1300)]
Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

Conflicts:
course/yui/toolboxes/toolboxes.js

8 years agoNOBUG fixed up whitespace
Sam Hemelryk [Mon, 30 Sep 2013 02:51:08 +0000 (15:51 +1300)]
NOBUG fixed up whitespace

8 years agoMerge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 30 Sep 2013 02:42:03 +0000 (15:42 +1300)]
Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 29 Sep 2013 23:09:50 +0000 (12:09 +1300)]
Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 29 Sep 2013 22:55:19 +0000 (11:55 +1300)]
Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle

8 years agoNOBUG: rebuilt bootstrap CSS
Sam Hemelryk [Sun, 29 Sep 2013 22:10:21 +0000 (11:10 +1300)]
NOBUG: rebuilt bootstrap CSS

8 years agoMerge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)]
Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Sun, 29 Sep 2013 21:38:11 +0000 (10:38 +1300)]
Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle

8 years agoMDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css
Mary Evans [Sat, 28 Sep 2013 15:26:01 +0000 (16:26 +0100)]
MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css

8 years agoMDL-33569 themes: Labels create extra margin below content.
Mary Evans [Sat, 28 Sep 2013 14:07:22 +0000 (15:07 +0100)]
MDL-33569 themes: Labels create extra margin below content.

8 years agoMDL-16464 remove multichoice answers field.
Tim Hunt [Mon, 23 Sep 2013 18:34:15 +0000 (19:34 +0100)]
MDL-16464 remove multichoice answers field.

This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.

At the same time, rename tables and columns to match the coding
guidelines.

8 years agoMDL-41707 allow custom location of external test files used from unit tests
Petr Škoda [Tue, 24 Sep 2013 19:11:10 +0000 (21:11 +0200)]
MDL-41707 allow custom location of external test files used from unit tests

8 years agoMDL-41942 course: Allow course listings to work with caches disabled
Marina Glancy [Fri, 27 Sep 2013 05:32:27 +0000 (15:32 +1000)]
MDL-41942 course: Allow course listings to work with caches disabled

8 years agoMDL-41176 do not set description and pw fields in $USER when editing own profile
Petr Škoda [Mon, 23 Sep 2013 19:15:59 +0000 (21:15 +0200)]
MDL-41176 do not set description and pw fields in $USER when editing own profile

8 years agoMDL-41176 make sure fresh full user record is used when mailing email confirmation
Petr Škoda [Mon, 23 Sep 2013 19:15:19 +0000 (21:15 +0200)]
MDL-41176 make sure fresh full user record is used when mailing email confirmation

8 years agoMDL-41176 fix obvious bugs and typos in new user API
Petr Škoda [Mon, 23 Sep 2013 18:54:55 +0000 (20:54 +0200)]
MDL-41176 fix obvious bugs and typos in new user API

8 years agoMDL-41676 Corrected logic when to dim the activity name and content
Marina Glancy [Thu, 19 Sep 2013 03:45:46 +0000 (13:45 +1000)]
MDL-41676 Corrected logic when to dim the activity name and content

8 years agoMDL-32773 Add a help icon for button 'Set main file' in filemanager
Marina Glancy [Tue, 3 Sep 2013 01:44:43 +0000 (11:44 +1000)]
MDL-32773 Add a help icon for button 'Set main file' in filemanager

8 years agoMDL-41888 More comments
Jamie Pratt [Wed, 25 Sep 2013 05:22:41 +0000 (12:22 +0700)]
MDL-41888 More comments

8 years agoMDL-41888 allow for a blank string as format to mean not to show stat
Jamie Pratt [Tue, 24 Sep 2013 10:03:36 +0000 (17:03 +0700)]
MDL-41888 allow for a blank string as format to mean not to show stat

as in MDL-41929 which applies to older stable branches.

8 years agoMDL-41888 separate out quiz statistics calculations from report code
Jamie Pratt [Thu, 19 Sep 2013 08:55:24 +0000 (15:55 +0700)]
MDL-41888 separate out quiz statistics calculations from report code

also code clean up.

8 years agoMDL-33416 files: Remove unused reference fields in files table
Marina Glancy [Fri, 13 Sep 2013 06:46:25 +0000 (16:46 +1000)]
MDL-33416 files: Remove unused reference fields in files table

Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync

8 years agoweekly release 2.6dev
Marina Glancy [Fri, 27 Sep 2013 04:23:44 +0000 (14:23 +1000)]
weekly release 2.6dev

8 years agofix permissions
Marina Glancy [Fri, 27 Sep 2013 04:21:20 +0000 (14:21 +1000)]
fix permissions

8 years agoie9 svg compatibility fixes
Marina Glancy [Fri, 27 Sep 2013 04:17:23 +0000 (14:17 +1000)]
ie9 svg compatibility fixes

8 years agoMDL-35217 afterburner: applying orientations
Mary Evans [Thu, 26 Sep 2013 23:43:44 +0000 (01:43 +0200)]
MDL-35217 afterburner: applying orientations

8 years agoMerge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
Sam Hemelryk [Thu, 26 Sep 2013 23:32:05 +0000 (11:32 +1200)]
Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

Conflicts:
mod/scorm/db/upgrade.php

8 years agoMDL-39910 SCORM: set correct site level defaults.
Dan Marsden [Thu, 26 Sep 2013 09:03:00 +0000 (21:03 +1200)]
MDL-39910 SCORM: set correct site level defaults.

8 years agoMDL-39910 SCORM: set correct site level defaults.
Dan Marsden [Thu, 26 Sep 2013 09:03:00 +0000 (21:03 +1200)]
MDL-39910 SCORM: set correct site level defaults.

8 years agoMDL-41995 calendar: changed the page layout for the export page
Mark Nelson [Thu, 26 Sep 2013 03:57:21 +0000 (11:57 +0800)]
MDL-41995 calendar: changed the page layout for the export page

8 years agoMDL-41962 events: Bumping plugin versions to update handlers
Frederic Massart [Thu, 26 Sep 2013 06:56:12 +0000 (14:56 +0800)]
MDL-41962 events: Bumping plugin versions to update handlers

8 years agoMDL-26408 enrol_imsenterprise: fix invalid component
Dan Poltawski [Thu, 26 Sep 2013 04:17:29 +0000 (12:17 +0800)]
MDL-26408 enrol_imsenterprise: fix invalid component

8 years agoMDL-41912 editor_atto: Padding for editable area
Frederic Massart [Wed, 25 Sep 2013 08:47:58 +0000 (16:47 +0800)]
MDL-41912 editor_atto: Padding for editable area

8 years agoRevert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"
Marina Glancy [Thu, 26 Sep 2013 02:29:03 +0000 (12:29 +1000)]
Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"

This reverts commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to 88a4cb473439f5a2875260368b92fac1bb808c12.

8 years agoMDL-12403 backup: prevent unset config from being applied
Dan Poltawski [Wed, 25 Sep 2013 03:57:22 +0000 (11:57 +0800)]
MDL-12403 backup: prevent unset config from being applied

8 years agoMDL-12403 backup: ability configure default for question bank excludes
Dan Poltawski [Fri, 20 Sep 2013 04:01:43 +0000 (12:01 +0800)]
MDL-12403 backup: ability configure default for question bank excludes

8 years agoMDL-12403 backup: configure question bank in automated backups
Dan Poltawski [Fri, 20 Sep 2013 03:57:58 +0000 (11:57 +0800)]
MDL-12403 backup: configure question bank in automated backups

8 years agoMDL-12403 backup: Ability to exclude question bank
Dan Poltawski [Thu, 19 Sep 2013 06:32:12 +0000 (14:32 +0800)]
MDL-12403 backup: Ability to exclude question bank

Now users can choose to exclude the question bank from the backup,
this will in turn prevent any modules which use the question bank
from being included in the backup.

8 years agoMDL-41885 modules now declare use of question bank
Dan Poltawski [Thu, 19 Sep 2013 06:26:37 +0000 (14:26 +0800)]
MDL-41885 modules now declare use of question bank

* FEATURE_USES_QUESTION_BANK is now a module_supports flag which declares
  that an activity uses the question engine.

* question_module_uses_questions can be used to determine if a module
  uses the question bank.

8 years agoRevert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined...
Sam Hemelryk [Wed, 25 Sep 2013 23:56:00 +0000 (11:56 +1200)]
Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)"

This reverts commit e89dfdbce62ad5be906cb2d822fa0f746cf6afd6.

8 years agoMerge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle
Sam Hemelryk [Wed, 25 Sep 2013 22:13:01 +0000 (10:13 +1200)]
Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle

8 years agoMerge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 21:48:42 +0000 (23:48 +0200)]
Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle

8 years agoRevert "MDL-39871 output: improved block manipulation inheritance"
Sam Hemelryk [Wed, 25 Sep 2013 21:12:44 +0000 (09:12 +1200)]
Revert "MDL-39871 output: improved block manipulation inheritance"

This reverts commit eeb08203dce0131d3988a3707fbbf8563cd4bd30.

8 years agoMDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide
Andrew Nicols [Wed, 25 Sep 2013 17:09:54 +0000 (18:09 +0100)]
MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide

8 years agoMDL-39910 mod_scorm: fix enable/disable navigation buttons
Mayank Gupta [Wed, 25 Sep 2013 11:11:33 +0000 (16:41 +0530)]
MDL-39910 mod_scorm: fix enable/disable navigation buttons

8 years agoMerge branch 'int_uninstall' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 11:36:40 +0000 (13:36 +0200)]
Merge branch 'int_uninstall' of https://github.com/skodak/moodle

8 years agoMDL-39910 mod_scorm: fix enable/disable navigation buttons
Mayank Gupta [Wed, 25 Sep 2013 11:11:33 +0000 (16:41 +0530)]
MDL-39910 mod_scorm: fix enable/disable navigation buttons

8 years agoMerge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 09:41:45 +0000 (11:41 +0200)]
Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle

8 years agoMDL-41437 inform developers that version column was removed from module and block...
Petr Škoda [Wed, 25 Sep 2013 08:52:23 +0000 (10:52 +0200)]
MDL-41437 inform developers that version column was removed from module and block tables

8 years agoMDL-41437 fix some more forgotten module.version's
Petr Škoda [Wed, 25 Sep 2013 08:50:00 +0000 (10:50 +0200)]
MDL-41437 fix some more forgotten module.version's

8 years agoMDL-41437 refactor and cleanup module uninstall support
Petr Škoda [Wed, 25 Sep 2013 08:27:09 +0000 (10:27 +0200)]
MDL-41437 refactor and cleanup module uninstall support

8 years agoMDL-41437 implement new block, enrol and course format pluginfo uninstall methods
Petr Škoda [Wed, 25 Sep 2013 08:12:11 +0000 (10:12 +0200)]
MDL-41437 implement new block, enrol and course format pluginfo uninstall methods

8 years agoMDL-43437 fix course format disabling
Petr Škoda [Wed, 25 Sep 2013 08:03:06 +0000 (10:03 +0200)]
MDL-43437 fix course format disabling

8 years agoMDL-41437 implement plugininfo_quiz necessary for quiz report uninstall
Petr Škoda [Wed, 25 Sep 2013 07:57:19 +0000 (09:57 +0200)]
MDL-41437 implement plugininfo_quiz necessary for quiz report uninstall

8 years agoMDL-41437 fix non-functional message processor uninstall
Petr Škoda [Wed, 25 Sep 2013 07:39:36 +0000 (09:39 +0200)]
MDL-41437 fix non-functional message processor uninstall

8 years agoMDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade...
Dan Marsden [Wed, 25 Sep 2013 07:25:37 +0000 (19:25 +1200)]
MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings

8 years agoMDL-41208 fix more invalid @VERSION@
Petr Škoda [Wed, 25 Sep 2013 07:14:36 +0000 (09:14 +0200)]
MDL-41208 fix more invalid @VERSION@

8 years agoMDL-41421 tool_generator: Fixing help text
David Monllao [Wed, 25 Sep 2013 07:06:35 +0000 (15:06 +0800)]
MDL-41421 tool_generator: Fixing help text

- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together

8 years agoMDL-41437 fix and cleanup filter uninstall
Petr Škoda [Wed, 25 Sep 2013 06:41:33 +0000 (08:41 +0200)]
MDL-41437 fix and cleanup filter uninstall

8 years agoMerge branch 'MDL-40848_master' of git://github.com/totara/openbadges
Sam Hemelryk [Wed, 25 Sep 2013 04:27:09 +0000 (16:27 +1200)]
Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges

Conflicts:
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-41912-master' of git://github.com/damyon/moodle
Marina Glancy [Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)]
Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/styles.css

8 years agoMerge branch 'MDL-41778_master' of https://github.com/nitzo/moodle
Marina Glancy [Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)]
Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle

8 years agoMerge branch 'MDL-41870-master' of git://github.com/damyon/moodle
Marina Glancy [Wed, 25 Sep 2013 02:21:46 +0000 (12:21 +1000)]
Merge branch 'MDL-41870-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41713-master' of git://github.com/phalacee/moodle
Marina Glancy [Wed, 25 Sep 2013 02:21:37 +0000 (12:21 +1000)]
Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle

Conflicts:
lib/editor/atto/styles.css

8 years agoMerge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle
Marina Glancy [Wed, 25 Sep 2013 01:53:48 +0000 (11:53 +1000)]
Merge branch 'MDL-41421_master' of git://github.com/dmonllao/moodle

8 years agoMDL-41845 Activity Completion: Make default selection an option.
Eric Merrill [Tue, 17 Sep 2013 19:07:19 +0000 (15:07 -0400)]
MDL-41845 Activity Completion: Make default selection an option.

Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.

8 years agoMDL-41421 tool_generator: Adding a CLI tool to generate the test plan
David Monllao [Thu, 5 Sep 2013 05:38:43 +0000 (13:38 +0800)]
MDL-41421 tool_generator: Adding a CLI tool to generate the test plan

8 years agoMDL-41421 tool_generator: Adding a test plan generator to feed JMeter
David Monllao [Wed, 28 Aug 2013 08:50:00 +0000 (16:50 +0800)]
MDL-41421 tool_generator: Adding a test plan generator to feed JMeter

Also changing course_backend.php coding style
according to codechecker.

8 years agoMerge branch 'MDL-41910_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 01:09:51 +0000 (03:09 +0200)]
Merge branch 'MDL-41910_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle
Marina Glancy [Wed, 25 Sep 2013 00:54:19 +0000 (10:54 +1000)]
Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:38:34 +0000 (02:38 +0200)]
Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle

Conflicts:
admin/tool/generator/classes/site_backend.php

8 years agoMerge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)]
Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle