Sam Hemelryk [Tue, 24 Sep 2013 22:18:30 +0000 (10:18 +1200)]
Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 24 Sep 2013 22:02:57 +0000 (10:02 +1200)]
Merge branch 'MDL-40835_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 24 Sep 2013 21:59:31 +0000 (09:59 +1200)]
Merge branch 'MDL-39730_master' of https://github.com/nadavkav/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)]
Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:31:43 +0000 (09:31 +1200)]
Merge branch 'MDL-38286-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 24 Sep 2013 21:27:44 +0000 (09:27 +1200)]
Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:23:15 +0000 (23:23 +0200)]
Merge branch 'MDL-40811-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:20:53 +0000 (23:20 +0200)]
Merge branch 'wip-MDL-41594-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)]
Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
Conflicts:
lang/en/moodle.php
Petr Škoda [Tue, 24 Sep 2013 20:43:46 +0000 (22:43 +0200)]
MDL-41437 fix plugin install issues
This patch prevents inclusion of settings from plugin that or not yet installed or upgraded,
this matches the original logic where we were using the modules table.
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 18:18:03 +0000 (20:18 +0200)]
Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle
Conflicts:
admin/auth.php
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)]
Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 24 Sep 2013 11:42:20 +0000 (21:42 +1000)]
Merge branch 'MDL-40550_master' of https://github.com/totara/openbadges
Marina Glancy [Tue, 24 Sep 2013 11:31:46 +0000 (21:31 +1000)]
Merge branch 'MDL-41929' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 24 Sep 2013 10:53:49 +0000 (20:53 +1000)]
MDL-41937 tests: reset time limit after test
Marina Glancy [Tue, 24 Sep 2013 10:02:57 +0000 (20:02 +1000)]
MDL-39962 - Events: added missing required file
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
Sam Hemelryk [Tue, 24 Sep 2013 09:16:29 +0000 (21:16 +1200)]
Merge branch 'int_behat' of https://github.com/skodak/moodle
Petr Škoda [Tue, 24 Sep 2013 06:59:29 +0000 (08:59 +0200)]
MDL-37324 fix phpunit and behat SESSION and USER setup
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
Marina Glancy [Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)]
Merge branch 'MDL-41733_master' of git://github.com/StudiUM/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
Adrian Greeve [Mon, 12 Aug 2013 03:38:39 +0000 (11:38 +0800)]
MDL-39962 - Events: Replace lefacy event lti_unknown_service_api call.
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.
Marina Glancy [Tue, 24 Sep 2013 01:49:02 +0000 (11:49 +1000)]
Merge branch 'MDL-41840-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
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
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
Dan Marsden [Wed, 4 Sep 2013 06:46:35 +0000 (18:46 +1200)]
MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos
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
Sam Hemelryk [Mon, 23 Sep 2013 22:58:46 +0000 (10:58 +1200)]
MDL-39910 mod_scorm: fixed install.xml not nulls
Sam Hemelryk [Mon, 23 Sep 2013 22:37:14 +0000 (10:37 +1200)]
MDL-39871 output: improved block manipulation inheritance
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
Sam Hemelryk [Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)]
Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
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.
Sam Hemelryk [Mon, 23 Sep 2013 21:14:37 +0000 (09:14 +1200)]
Merge branch 'MDL-35217_M26' of git://github.com/lazydaisy/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
Sam Hemelryk [Mon, 23 Sep 2013 20:51:41 +0000 (08:51 +1200)]
Merge branch 'MDL-40048-master' of git://github.com/FMCorz/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
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
Eloy Lafuente (stronk7) [Mon, 23 Sep 2013 20:05:26 +0000 (22:05 +0200)]
Merge branch 'int_install' of https://github.com/skodak/moodle
Petr Škoda [Mon, 23 Sep 2013 19:35:18 +0000 (21:35 +0200)]
MDL-31501 fake requried globals in both installers
Tim Hunt [Mon, 23 Sep 2013 17:05:57 +0000 (18:05 +0100)]
MDL-41929 quiz statistics, overall stats not displayed.
Marina Glancy [Mon, 23 Sep 2013 09:16:43 +0000 (19:16 +1000)]
Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
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
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
Petr Škoda [Mon, 23 Sep 2013 08:11:27 +0000 (10:11 +0200)]
MDL-37324 fix phpmailer method case names and standardise phpmailer init
David Monllao [Thu, 19 Sep 2013 08:47:04 +0000 (16:47 +0800)]
MDL-41889 tool_generator: Fixing problem detecting the last used course shortname
Marina Glancy [Mon, 23 Sep 2013 04:48:10 +0000 (14:48 +1000)]
Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle
Andrew Davis [Mon, 23 Sep 2013 04:40:34 +0000 (11:40 +0700)]
MDL-41591 removed unnecessary zindexes from Clean
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
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.
Sam Hemelryk [Mon, 23 Sep 2013 03:38:45 +0000 (15:38 +1200)]
MDL-31501 session: fixed missing autoloader during install
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
Frederic Massart [Mon, 23 Sep 2013 02:55:18 +0000 (10:55 +0800)]
MDL-40048 events: New abstract event for old 'view all' log
Petr Škoda [Sat, 14 Sep 2013 21:57:21 +0000 (23:57 +0200)]
MDL-41437 rework plugin_manager caching and version info in blocks and modules
This patch includes:
* version column removed from modules table, now using standard config, this allows decimal version for modules
* version column removed from block table, now using standard config, this allows decimal version for blocks
* module version.php can safely use $plugins instead of module
* new plugin_manager bulk caching, this should help with MUC performance when logged in as admin
* all missing plugins are now in plugin overview (previously only blocks and modules)
* simplified code and improved coding style
* reworked plugin_manager unit tests - now using real plugins instead of mocks
* unit tests now fail if any plugin does not contain proper version.php file
* allow uninstall of deleted filters
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
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.
Petr Škoda [Thu, 19 Sep 2013 19:10:50 +0000 (21:10 +0200)]
MDL-37324 import phpmailer 5.2.7
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
Petr Škoda [Thu, 19 Sep 2013 20:02:45 +0000 (22:02 +0200)]
MDL-41903 import typo3 4.7.15
Petr Škoda [Thu, 19 Sep 2013 20:26:01 +0000 (22:26 +0200)]
MDL-41904 import Markdown lib 1.3
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
Nadav Kavalerchik [Thu, 19 Sep 2013 09:57:13 +0000 (12:57 +0300)]
MDL-39730 - Right align Badges pages when using RTL mode (theme/standard)
Nadav Kavalerchik [Thu, 19 Sep 2013 09:20:49 +0000 (12:20 +0300)]
MDL-40835 - "My badges" page, text need to be align right, in RTL mode (theme/clean, bootstrapbase)
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
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.
Frederic Massart [Thu, 19 Sep 2013 10:36:00 +0000 (18:36 +0800)]
MDL-41726 mod_quiz: Replace handlers with observers for group events
This also implements a filtering of the events to be handled when
a course reset has been started.
Sam Hemelryk [Fri, 20 Sep 2013 02:40:59 +0000 (14:40 +1200)]
weekly release 2.6dev
Sam Hemelryk [Fri, 20 Sep 2013 02:37:30 +0000 (14:37 +1200)]
NOBUG: fixed file permissions
Sam Hemelryk [Fri, 20 Sep 2013 02:34:25 +0000 (14:34 +1200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Eric Merrill [Thu, 19 Sep 2013 22:43:21 +0000 (18:43 -0400)]
MDL-41907 Repositories: Maintain the sortorder of a file when overwriting it.
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.
Andrew Davis [Thu, 19 Sep 2013 03:19:39 +0000 (10:19 +0700)]
MDL-41591 removed some unnecessary z-indexes from css
AMOS bot [Thu, 19 Sep 2013 00:44:10 +0000 (00:44 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 18 Sep 2013 21:49:31 +0000 (09:49 +1200)]
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
Dan Marsden [Wed, 18 Sep 2013 21:36:52 +0000 (09:36 +1200)]
MDL-38489 SCORM: obtain correct section number when getting course_url
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
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
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.
Andrew Nicols [Wed, 18 Sep 2013 10:04:25 +0000 (11:04 +0100)]
MDL-38661 JavaScript: Add missing lazy loading on collapseall
AMOS bot [Wed, 18 Sep 2013 00:45:28 +0000 (00:45 +0000)]
Automatically generated installer lang files
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
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
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
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
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
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
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
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.
Marina Glancy [Thu, 5 Sep 2013 01:30:45 +0000 (11:30 +1000)]
MDL-41594 Bug fix for orphaned invisible categories
thanks to L.Sanocki
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
Marina Glancy [Tue, 17 Sep 2013 06:43:12 +0000 (16:43 +1000)]
Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle
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.
Sam Hemelryk [Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)]
Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/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
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
Sam Hemelryk [Tue, 17 Sep 2013 02:00:15 +0000 (14:00 +1200)]
Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/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
Marina Glancy [Tue, 17 Sep 2013 01:08:27 +0000 (11:08 +1000)]
Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle