moodle.git
8 years agoMerge branch 'MDL-41929' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 24 Sep 2013 11:31:46 +0000 (21:31 +1000)]
Merge branch 'MDL-41929' of git://github.com/timhunt/moodle

8 years agoMDL-39962 - Events: added missing required file
Marina Glancy [Tue, 24 Sep 2013 10:02:57 +0000 (20:02 +1000)]
MDL-39962 - Events: added missing required file

8 years agoMerge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)]
Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'int_behat' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Sep 2013 09:16:29 +0000 (21:16 +1200)]
Merge branch 'int_behat' of https://github.com/skodak/moodle

8 years agoMDL-37324 fix phpunit and behat SESSION and USER setup
Petr Škoda [Tue, 24 Sep 2013 06:59:29 +0000 (08:59 +0200)]
MDL-37324 fix phpunit and behat SESSION and USER setup

8 years agoMerge branch 'MDL-41725-master-onecommit' of git://github.com/jamiepratt/moodle
Marina Glancy [Tue, 24 Sep 2013 06:49:50 +0000 (16:49 +1000)]
Merge branch 'MDL-41725-master-onecommit' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle
Marina Glancy [Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)]
Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle

8 years agoMerge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 24 Sep 2013 06:29:00 +0000 (16:29 +1000)]
Merge branch 'MDL-41087-master' of git://github.com/sammarshallou/moodle

8 years agoMDL-39962 - Events: Replace lefacy event lti_unknown_service_api call.
Adrian Greeve [Mon, 12 Aug 2013 03:38:39 +0000 (11:38 +0800)]
MDL-39962 - Events: Replace lefacy event lti_unknown_service_api call.

8 years agoMDL-39962 - Events: Replace the legacy event workshop_viewed
Adrian Greeve [Tue, 6 Aug 2013 06:23:03 +0000 (14:23 +0800)]
MDL-39962 - Events: Replace the legacy event workshop_viewed

This also includes the abstract class course_module_viewed.

8 years agoMerge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 24 Sep 2013 01:49:02 +0000 (11:49 +1000)]
Merge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 24 Sep 2013 01:48:49 +0000 (11:48 +1000)]
Merge branch 'MDL-41669-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Sep 2013 00:14:16 +0000 (12:14 +1200)]
Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle

8 years agoMerge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Sep 2013 00:09:47 +0000 (12:09 +1200)]
Merge branch 'w39_MDL-41903_m26_typo3' of https://github.com/skodak/moodle

8 years agoMerge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 24 Sep 2013 00:01:03 +0000 (12:01 +1200)]
Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle

8 years agoMDL-39910 mod_scorm: fixed install.xml not nulls
Sam Hemelryk [Mon, 23 Sep 2013 22:58:46 +0000 (10:58 +1200)]
MDL-39910 mod_scorm: fixed install.xml not nulls

8 years agoMDL-39871 output: improved block manipulation inheritance
Sam Hemelryk [Mon, 23 Sep 2013 22:37:14 +0000 (10:37 +1200)]
MDL-39871 output: improved block manipulation inheritance

8 years agoMerge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle
Sam Hemelryk [Mon, 23 Sep 2013 22:02:58 +0000 (10:02 +1200)]
Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

8 years agoMerge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)]
Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle

8 years agoMDL-40107 import tcpdf 6.0.031
Petr Škoda [Thu, 19 Sep 2013 19:37:59 +0000 (21:37 +0200)]
MDL-40107 import tcpdf 6.0.031

Includes a few more small asian fonts.

8 years agoMerge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 23 Sep 2013 21:14:37 +0000 (09:14 +1200)]
Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 23 Sep 2013 21:04:27 +0000 (09:04 +1200)]
Merge branch 'master_MDL-39910' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-40048-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:51:41 +0000 (08:51 +1200)]
Merge branch 'MDL-40048-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:33:10 +0000 (08:33 +1200)]
Merge branch 'MDL-36465-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 23 Sep 2013 20:28:40 +0000 (08:28 +1200)]
Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'int_install' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 23 Sep 2013 20:05:26 +0000 (22:05 +0200)]
Merge branch 'int_install' of https://github.com/skodak/moodle

8 years agoMDL-31501 fake requried globals in both installers
Petr Škoda [Mon, 23 Sep 2013 19:35:18 +0000 (21:35 +0200)]
MDL-31501 fake requried globals in both installers

8 years agoMDL-41929 quiz statistics, overall stats not displayed.
Tim Hunt [Mon, 23 Sep 2013 17:05:57 +0000 (18:05 +0100)]
MDL-41929 quiz statistics, overall stats not displayed.

8 years agoMerge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 23 Sep 2013 09:16:43 +0000 (19:16 +1000)]
Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-36465 Course JavaScript: Ensure that the zero section is not draggable
Andrew Nicols [Sun, 22 Sep 2013 21:11:33 +0000 (22:11 +0100)]
MDL-36465 Course JavaScript: Ensure that the zero section is not draggable

8 years agoMerge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle
Marina Glancy [Mon, 23 Sep 2013 08:15:35 +0000 (18:15 +1000)]
Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle

8 years agoMDL-37324 fix phpmailer method case names and standardise phpmailer init
Petr Škoda [Mon, 23 Sep 2013 08:11:27 +0000 (10:11 +0200)]
MDL-37324 fix phpmailer method case names and standardise phpmailer init

8 years agoMerge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 23 Sep 2013 04:48:10 +0000 (14:48 +1000)]
Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-41591 removed unnecessary zindexes from Clean
Andrew Davis [Mon, 23 Sep 2013 04:40:34 +0000 (11:40 +0700)]
MDL-41591 removed unnecessary zindexes from Clean

8 years agoMerge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle
Marina Glancy [Mon, 23 Sep 2013 04:39:45 +0000 (14:39 +1000)]
Merge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle

8 years agoMDL-40048 mod_chat: Replacing add_to_log with new events
Frederic Massart [Tue, 17 Sep 2013 09:23:59 +0000 (17:23 +0800)]
MDL-40048 mod_chat: Replacing add_to_log with new events

For this to be done properly, a new function to send the message
and trigger the event has been created. Following that a
data generator for chat, and some unit tests.

8 years agoMDL-31501 session: fixed missing autoloader during install
Sam Hemelryk [Mon, 23 Sep 2013 03:38:45 +0000 (15:38 +1200)]
MDL-31501 session: fixed missing autoloader during install

8 years agoMerge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Sep 2013 03:02:49 +0000 (15:02 +1200)]
Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle

8 years agoMDL-40048 events: New abstract event for old 'view all' log
Frederic Massart [Mon, 23 Sep 2013 02:55:18 +0000 (10:55 +0800)]
MDL-40048 events: New abstract event for old 'view all' log

8 years agoMDL-35217 theme_afterburner: reduce size of sideblocks in Afterburner and make into...
Mary Evans [Sun, 22 Sep 2013 14:11:39 +0000 (15:11 +0100)]
MDL-35217 theme_afterburner: reduce size of sideblocks in Afterburner and make into fully responsive design.

Squashed commit of the following:

commit 8871ed6a5ca3f3ecbf6d9c20ebe5a9badcfe0fef
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Sep 22 14:57:18 2013 +0100

    MDL-35217 theme_afterburner: Added styles to block and course page editing icons.

    Adjusted @media styles in syyle/responsive.css.

commit 6ee5035b77f4e6fb10fc14b4d18e70ab5b8cb174
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Mon Sep 16 02:09:01 2013 +0100

    MDL-35217 theme_afterbuener: Fix for first docked block top-margin reduced to zero.

commit fc6a3fbf9267d778b8f85af0c73f6628890ccbc4
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Mon Sep 16 01:23:21 2013 +0100

    MDL-35217_M26 theme_afterburner: Improvment to make Afterburner fully responsive.

    This commit builds on the work already commited by Richard Olemann.

commit f7a750a90d40d60e965485b2a3fcb112b5e2bd80
Author: roelmann <oelmann.richard@gmail.com>
Date:   Thu Sep 12 15:55:46 2013 +0100

    wip-MDL_35217-afterburner: Reduce sidebar widths, make layout responsive, hide logo on small screens

8 years agoMDL-31501 rework user session architecture
Petr Škoda [Sun, 8 Sep 2013 06:38:52 +0000 (08:38 +0200)]
MDL-31501 rework user session architecture

List of changes:
 * New OOP API using PHP namespace \core\session\.
 * All handlers now update the sessions table consistently.
 * Experimental DB session support in Oracle.
 * Full support for session file handler (filesystem locking required).
 * New option for alternative session directory.
 * Official memcached session handler support.
 * Workaround for memcached version with non-functional gc.
 * Improved security - forced session id regeneration.
 * Improved compatibility with recent PHP releases.
 * Fixed borked CSS during install in debug mode.
 * Switched to file based sessions in new installs.
 * DB session setting disappears if DB does not support sessions.
 * DB session setting disappears if session handler specified in config.php.
 * Fast purging of sessions used in request only.
 * No legacy distinction -  file, database and memcached support the same functionality.
 * Session handler name included in performance info.
 * Fixed user_loggedin and user_loggedout event triggering.
 * Other minor bugfixing and improvements.
 * Fixed database session segfault if MUC disposed before $DB.

Limitations:
 * Session access time is now updated right after session start.
 * Support for $CFG->sessionlockloggedinonly was removed.
 * First request does not update userid in sessions table.
 * The timeouts may break badly if server hosting forces PHP.ini session settings.
 * The session GC is a lot slower, we do not rely on external session timeouts.
 * There cannot be any hooks triggered at the session write time.
 * File and memcached handlers do not support session lock acquire timeouts.
 * Some low level PHP session functions can not be used directly in Moodle code.

8 years agoMDL-37324 import phpmailer 5.2.7
Petr Škoda [Thu, 19 Sep 2013 19:10:50 +0000 (21:10 +0200)]
MDL-37324 import phpmailer 5.2.7

8 years agoMDL-41208 import YUI 3.12.0 with @VERSION@ fix for simpleyui
Petr Škoda [Sat, 31 Aug 2013 13:21:32 +0000 (15:21 +0200)]
MDL-41208 import YUI 3.12.0 with @VERSION@ fix for simpleyui

8 years agoMDL-41903 import typo3 4.7.15
Petr Škoda [Thu, 19 Sep 2013 20:02:45 +0000 (22:02 +0200)]
MDL-41903 import typo3 4.7.15

8 years agoMDL-41904 import Markdown lib 1.3
Petr Škoda [Thu, 19 Sep 2013 20:26:01 +0000 (22:26 +0200)]
MDL-41904 import Markdown lib 1.3

8 years agoMDL-41787 make sure maturity constants are defined before they are used in core_compo...
Petr Škoda [Sat, 14 Sep 2013 09:57:49 +0000 (11:57 +0200)]
MDL-41787 make sure maturity constants are defined before they are used in core_component class

8 years agoMDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav...
Mayank Gupta [Sun, 30 Jun 2013 06:38:18 +0000 (12:08 +0530)]
MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits

8 years agoMDL-41725 move db tables from quiz stats report
Jamie Pratt [Wed, 11 Sep 2013 11:54:22 +0000 (18:54 +0700)]
MDL-41725 move db tables from quiz stats report

to question bank

- move cron to clean up old cache records move code and
rename classes
- further review of the quiz reports statistics code
- starting to separate calculations of quiz stats, question stats and
response analysis
- introduce hashcode db field for cached stats convert
- code to use qubaids hashcode for caches

We just drop the old tables (including previous upgrade steps) and
re-create the new ones, because these tables just cache calculated
statistics. No important data is stored in them.

8 years agoweekly release 2.6dev
Sam Hemelryk [Fri, 20 Sep 2013 02:40:59 +0000 (14:40 +1200)]
weekly release 2.6dev

8 years agoNOBUG: fixed file permissions
Sam Hemelryk [Fri, 20 Sep 2013 02:37:30 +0000 (14:37 +1200)]
NOBUG: fixed file permissions

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Fri, 20 Sep 2013 02:34:25 +0000 (14:34 +1200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoRevert "MDL-41466 theme_formal_white: moved courses action icons once again on the...
Sam Hemelryk [Thu, 19 Sep 2013 20:39:57 +0000 (08:39 +1200)]
Revert "MDL-41466 theme_formal_white: moved courses action icons once again on the right"

This reverts commit c724e009960a399170bbddc58ca2f26737504287.

8 years agoMDL-41591 removed some unnecessary z-indexes from css
Andrew Davis [Thu, 19 Sep 2013 03:19:39 +0000 (10:19 +0700)]
MDL-41591 removed some unnecessary z-indexes from css

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 19 Sep 2013 00:44:10 +0000 (00:44 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 18 Sep 2013 21:49:31 +0000 (09:49 +1200)]
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle

8 years agoMDL-38489 SCORM: obtain correct section number when getting course_url
Dan Marsden [Wed, 18 Sep 2013 21:36:52 +0000 (09:36 +1200)]
MDL-38489 SCORM: obtain correct section number when getting course_url

8 years agoMerge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 18 Sep 2013 15:09:25 +0000 (17:09 +0200)]
Merge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 18 Sep 2013 13:44:31 +0000 (15:44 +0200)]
Merge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle

8 years agoMDL-41188 javascript: Prevent scrolling to top
Damyon Wiese [Wed, 18 Sep 2013 12:21:34 +0000 (20:21 +0800)]
MDL-41188 javascript: Prevent scrolling to top

This fix is for dialogues that are not created until some time after the page
has loaded.

8 years agoMDL-38661 JavaScript: Add missing lazy loading on collapseall
Andrew Nicols [Wed, 18 Sep 2013 10:04:25 +0000 (11:04 +0100)]
MDL-38661 JavaScript: Add missing lazy loading on collapseall

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 18 Sep 2013 00:45:28 +0000 (00:45 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 19:57:07 +0000 (21:57 +0200)]
Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 19:22:30 +0000 (21:22 +0200)]
Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 19:17:05 +0000 (21:17 +0200)]
Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 19:11:26 +0000 (21:11 +0200)]
Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 18:22:32 +0000 (20:22 +0200)]
Merge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-41188-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 18:04:08 +0000 (20:04 +0200)]
Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 17:59:55 +0000 (19:59 +0200)]
Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle

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

8 years agoMDL-41840 Restore: Page title, breadcrumbs show incorrect stage
sam marshall [Tue, 17 Sep 2013 13:43:25 +0000 (14:43 +0100)]
MDL-41840 Restore: Page title, breadcrumbs show incorrect stage

Unfortunately it isn't possible to display the current stage before
printing header any more, because we need to be able to show a
progress bar while doing the code that considers whether or not
priunt stage. So this change removes stage information from page
title. It is still present (in bold) in the strip that shows where
you are within the restore/import.

This display was inconsistent anyway; change makes it consistent
between Restore and Import.

8 years agoMDL-41833 feedback: Fix setType() warning when deleting a response in feedback
Ankit Agarwal [Tue, 17 Sep 2013 07:14:19 +0000 (15:14 +0800)]
MDL-41833 feedback: Fix setType() warning when deleting a response in feedback

8 years agoMerge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle
Marina Glancy [Tue, 17 Sep 2013 06:43:12 +0000 (16:43 +1000)]
Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle

8 years agoMDL-41622 workshop mod: fix page heading levels.
Rossiani Wijaya [Tue, 17 Sep 2013 04:44:25 +0000 (12:44 +0800)]
MDL-41622 workshop mod: fix page heading levels.
Also, changing couple of the sub header to use notification, which is more appropriate.

8 years agoMerge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)]
Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 17 Sep 2013 02:30:16 +0000 (14:30 +1200)]
Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 17 Sep 2013 02:02:47 +0000 (14:02 +1200)]
Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 17 Sep 2013 02:00:15 +0000 (14:00 +1200)]
Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle
Marina Glancy [Tue, 17 Sep 2013 01:10:44 +0000 (11:10 +1000)]
Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 17 Sep 2013 01:08:27 +0000 (11:08 +1000)]
Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 17 Sep 2013 00:15:06 +0000 (02:15 +0200)]
Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 16 Sep 2013 23:44:39 +0000 (11:44 +1200)]
Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38489 mod_scorm: added require to be explicit
Sam Hemelryk [Mon, 16 Sep 2013 21:12:02 +0000 (09:12 +1200)]
MDL-38489 mod_scorm: added require to be explicit

8 years agoMerge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 16 Sep 2013 21:02:32 +0000 (09:02 +1200)]
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-41667' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 16 Sep 2013 20:59:08 +0000 (08:59 +1200)]
Merge branch 'MDL-41667' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37148-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Sep 2013 20:50:38 +0000 (08:50 +1200)]
Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41466_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 16 Sep 2013 20:48:59 +0000 (08:48 +1200)]
Merge branch 'MDL-41466_master' of git://github.com/kordan/moodle

8 years agoMerge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 16 Sep 2013 20:39:14 +0000 (08:39 +1200)]
Merge branch 'MDL-38317-master' of git://github.com/StudiUM/moodle

8 years agoMDL-41669 Restore: Progress bar needs to include more tasks
sam marshall [Fri, 16 Aug 2013 18:11:14 +0000 (19:11 +0100)]
MDL-41669 Restore: Progress bar needs to include more tasks

1. Changes progress bar code to allow headings for progress bar (so users have
   some clue what's going on if a page has more than one progress bar).
2. Changes restore code so that a progress bar can display during pre-checks if
   they take longer than 5 seconds.
3. Changes pre-check and restore code so that, in various points where the system
   can take a long time within an individual step, intederminate progress is
   indicated and it won't time out.

8 years agoMDL-41817 Backup/restore without blocks gives error
sam marshall [Mon, 16 Sep 2013 16:10:48 +0000 (17:10 +0100)]
MDL-41817 Backup/restore without blocks gives error

Also applies to various other situations where backup includes 0 of
something. This was caused by a problem in the progress-tracking code.

8 years agoMDL-41733 auth_cas: Allow direct authentication with CAS to a course when multiple...
Gilles-Philippe Leblanc [Wed, 11 Sep 2013 17:11:07 +0000 (13:11 -0400)]
MDL-41733 auth_cas: Allow direct authentication with CAS to a course when multiple authentication is activated

8 years agoMDL-41715 Increase size of char fiels in user table
Marina Glancy [Thu, 12 Sep 2013 01:24:17 +0000 (11:24 +1000)]
MDL-41715 Increase size of char fiels in user table

8 years agoMDL-41612 scorm: fix heading levels
Rossiani Wijaya [Mon, 16 Sep 2013 07:40:01 +0000 (15:40 +0800)]
MDL-41612 scorm: fix heading levels

8 years agoMDL-39959 events: Replace add_to_log() calls with events for course module actions...
Ankit Agarwal [Mon, 16 Sep 2013 05:42:21 +0000 (13:42 +0800)]
MDL-39959 events: Replace add_to_log() calls with events for course module actions (create, delete and update)

8 years agoMerge branch 'MDL-41621' of git://github.com/rwijaya/moodle
Marina Glancy [Mon, 16 Sep 2013 07:14:18 +0000 (17:14 +1000)]
Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle

8 years agoMDL-39959 events: Add unit tests for course module events
Ankit Agarwal [Mon, 16 Sep 2013 05:41:32 +0000 (13:41 +0800)]
MDL-39959 events: Add unit tests for course module events

test_course_module_created_event()
test_course_module_created_event_exceptions()
test_course_module_updated_event()
test_course_module_updated_event_exceptions()
test_course_module_deleted_event()
test_course_module_deleted_event_exceptions()

8 years ago MDL-39959 events: Add course module events
Ankit Agarwal [Mon, 16 Sep 2013 05:38:50 +0000 (13:38 +0800)]
 MDL-39959 events: Add course module events

Added event course_module_created
Added event course_module_updated
Added event course_module_deleted

8 years agoMerge branch 'MDL-41315-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 16 Sep 2013 05:31:20 +0000 (15:31 +1000)]
Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle

8 years agoMDL-41716 atto - Fix resizing inconsistencies between editor modes
Jason Fowler [Mon, 16 Sep 2013 03:52:38 +0000 (11:52 +0800)]
MDL-41716 atto - Fix resizing inconsistencies between editor modes

8 years agoMerge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 16 Sep 2013 03:07:57 +0000 (15:07 +1200)]
Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 16 Sep 2013 01:56:05 +0000 (13:56 +1200)]
Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'MDL-41637_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 16 Sep 2013 01:51:12 +0000 (13:51 +1200)]
Merge branch 'MDL-41637_master' of https://github.com/totara/openbadges