Dan Poltawski [Mon, 29 Apr 2013 13:20:39 +0000 (14:20 +0100)]
Merge branch 'MDL-39158-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 29 Apr 2013 13:15:23 +0000 (14:15 +0100)]
Merge branch 'MDL-39389' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Apr 2013 13:12:37 +0000 (14:12 +0100)]
Merge branch 'MDL-39390' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 29 Apr 2013 09:27:29 +0000 (10:27 +0100)]
Merge branch 'MDL-27071' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 29 Apr 2013 08:05:08 +0000 (16:05 +0800)]
Merge branch 'w17_MDL-39356_m25_cacert' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 29 Apr 2013 07:35:40 +0000 (15:35 +0800)]
Merge branch 'MDL-39342' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 29 Apr 2013 06:52:40 +0000 (14:52 +0800)]
Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 29 Apr 2013 06:17:53 +0000 (14:17 +0800)]
Merge branch 'MDL-38807-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Mon, 29 Apr 2013 06:03:34 +0000 (14:03 +0800)]
Merge branch 'MDL-30940-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 29 Apr 2013 05:00:19 +0000 (13:00 +0800)]
Merge branch 'MDL-39362' of git://github.com/rwijaya/moodle
Damyon Wiese [Mon, 29 Apr 2013 04:22:23 +0000 (12:22 +0800)]
Merge branch 'w17_MDL-39174_m25_themedocs' of git://github.com/skodak/moodle
Rossiani Wijaya [Mon, 29 Apr 2013 03:59:48 +0000 (11:59 +0800)]
MDL-39362 Admin: fixed setType() error for networking
Damyon Wiese [Mon, 29 Apr 2013 03:45:05 +0000 (11:45 +0800)]
Merge branch 'MDL-37845' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 29 Apr 2013 03:01:57 +0000 (11:01 +0800)]
Merge branch 'MDL-38440-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 29 Apr 2013 03:00:59 +0000 (15:00 +1200)]
Merge branch 'w17_MDL-39387_m25_authdocs' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 29 Apr 2013 02:45:55 +0000 (10:45 +0800)]
Merge branch 'MDL-36024-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 23:14:24 +0000 (01:14 +0200)]
MDL-27071 Allow Oracle IN() to use > 1000 items
By using a pivoting strategy, we modify the list
of params (QM and NAMED supported) into a
subquery, so the 1000 limit in Oracle (ORA-01795)
is not thrown anymore.
Sam Hemelryk [Sun, 28 Apr 2013 23:15:05 +0000 (11:15 +1200)]
Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 23:11:10 +0000 (01:11 +0200)]
MDL-27071 Add big IN() unit tests
Let's verify how all databases perform with a big
number of parameters (10000) using IN() SQL clauses.
Both using QM and NAMED parameters.
Ideally only Oracle fails, and only it will need fixing.
Sam Hemelryk [Sun, 28 Apr 2013 23:07:26 +0000 (11:07 +1200)]
Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 28 Apr 2013 22:54:07 +0000 (10:54 +1200)]
Merge branch 'MDL-39192_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 28 Apr 2013 22:45:33 +0000 (10:45 +1200)]
Merge branch 'wip-MDL-39298-master' of git://github.com/abgreeve/moodle
Petr Škoda [Sun, 28 Apr 2013 15:42:06 +0000 (17:42 +0200)]
MDL-39356 add ca certificate bundles for cURL
This is necessary because PHP in Windows does not have any certificates and some *nix systems have outdated or missing ca bundles too.
The order is:
1/ dataroot/moodleorgca.crt always wins - needs to be added manually by admin
2/ php.ini setting "curl.cainfo" is next
3/ on Windows libdir/cacert.pem is used because it does not have any default cert bundles
4/ system default is the last - the previous value, ok for properly configured *nix systems
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 16:33:33 +0000 (18:33 +0200)]
MDL-39390 delete old moodle_database column cache
With MDL-39389 all the remaining drivers have been moved
from the in-memory, per-request ::columns cache to
the MUC (databasemeta) alternative.
That makes the old cache unused, so this is, simply about to
delete it, and warn in upgrade notes for potential sites
using custom moodle_database drivers.
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 16:14:17 +0000 (18:14 +0200)]
MDL-39389 add databasemeta cache to pdo_sqlite
Done in a separate commit, coz this driver is not
truly supported, but considering it as a reference
for people developing drivers... it's better to
have it supporting the databasemeta cache.
Eloy Lafuente (stronk7) [Sun, 28 Apr 2013 16:12:38 +0000 (18:12 +0200)]
MDL-39389 add databasemeta cache to ms/oci drivers
Petr Škoda [Sat, 27 Apr 2013 13:27:29 +0000 (15:27 +0200)]
MDL-39371 add dependency of clean theme on bootstrapbase
Petr Škoda [Sat, 27 Apr 2013 13:09:05 +0000 (15:09 +0200)]
MDL-39387 normalise MOODLE_INTERNAL
Petr Škoda [Sat, 27 Apr 2013 13:06:40 +0000 (15:06 +0200)]
MDL-39387 fix /auth phpdocs
Petr Škoda [Sat, 27 Apr 2013 11:22:59 +0000 (13:22 +0200)]
MDL-39174 fix phpdocs packages in themes
Mary Evans [Fri, 26 Apr 2013 21:18:26 +0000 (22:18 +0100)]
MDL-39364 theme_clean: Changed 'simple' to 'clean'.
Petr Škoda [Wed, 24 Apr 2013 10:51:51 +0000 (12:51 +0200)]
MDL-39336 fix incorrect use on join() in simple theme
Petr Škoda [Wed, 24 Apr 2013 10:51:22 +0000 (12:51 +0200)]
MDL-39336 some themes may use $SITE->shortname in page layout before installation finishes
Petr Škoda [Wed, 24 Apr 2013 10:50:45 +0000 (12:50 +0200)]
MDL-39336 do not print debug output before finishing installation
Charles Fulton [Fri, 8 Mar 2013 20:26:36 +0000 (12:26 -0800)]
MDL-36024 enrol: enable grade recovery for all enrol plugins
Tim Hunt [Thu, 25 Apr 2013 10:18:12 +0000 (11:18 +0100)]
MDL-39342 stop users entering too long matching answers.
Since they lead to an ugly DB error.
Tim Hunt [Thu, 25 Apr 2013 16:07:36 +0000 (17:07 +0100)]
MDL-37845 multichoice qtype: Fix some display issues.
1. Better handling of multi-line choices in the correct answer display.
2. Remove dangerous CSS that is no longer needed.
Dan Poltawski [Fri, 26 Apr 2013 09:30:08 +0000 (10:30 +0100)]
on demand release 2.5beta+
Dan Poltawski [Fri, 26 Apr 2013 09:37:15 +0000 (10:37 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Fri, 26 Apr 2013 09:13:09 +0000 (11:13 +0200)]
MDL-39278 rebuild moodle.css with everything in place
Eloy Lafuente (stronk7) [Fri, 26 Apr 2013 09:10:09 +0000 (11:10 +0200)]
Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts:
theme/bootstrap/style/generated.css
theme/bootstrap/style/moodle.css
theme/bootstrapbase/less/moodle/recess.txt
theme/bootstrapbase/style/generated.css
Dan Poltawski [Fri, 26 Apr 2013 08:54:21 +0000 (09:54 +0100)]
MDL-39341 boostrapbase: fix some missing renames
Dan Poltawski [Fri, 26 Apr 2013 08:52:44 +0000 (09:52 +0100)]
Merge branch 'MDL-39341-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Fri, 26 Apr 2013 08:48:38 +0000 (10:48 +0200)]
Merge branch 'MDL-38888-master' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Fri, 26 Apr 2013 08:45:00 +0000 (16:45 +0800)]
MDL-38888 Publish forms display setType warning
Jerome Mouneyrac [Fri, 26 Apr 2013 07:13:03 +0000 (15:13 +0800)]
MDL-38440 WebService get_contents doesn't return the full text of labels
David Scotson [Fri, 19 Apr 2013 15:48:40 +0000 (16:48 +0100)]
MDL-39158 Increase form label width on wider screens
Damyon Wiese [Fri, 26 Apr 2013 04:49:26 +0000 (12:49 +0800)]
MDL-39341 Themes Rename bootstrap to bootstrapbase
Damyon Wiese [Fri, 26 Apr 2013 03:55:30 +0000 (11:55 +0800)]
Merge branch 'MDL-38833_settype' of git://github.com/andyjdavis/moodle
Damyon Wiese [Fri, 26 Apr 2013 03:33:55 +0000 (11:33 +0800)]
MDL-39278 Bootstrap - Change generated.css to moodle.css
The filename generated.css comes from moodle.less - so this is more obvious.
Andrew Davis [Thu, 18 Apr 2013 02:02:52 +0000 (10:02 +0800)]
MDL-38833 core_grade: added a set_type for finalgrade
Damyon Wiese [Fri, 26 Apr 2013 01:15:14 +0000 (09:15 +0800)]
Merge branch 'MDL-39250_clean_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Thu, 25 Apr 2013 21:50:08 +0000 (23:50 +0200)]
Merge branch 'MDL-39358-standard-clean' of git://github.com/mudrd8mz/moodle
David Mudrák [Thu, 25 Apr 2013 20:23:58 +0000 (22:23 +0200)]
MDL-39358 Mark the new theme_clean as a standard plugin
Andrew Nicols [Thu, 25 Apr 2013 16:03:55 +0000 (17:03 +0100)]
MDL-39355 JavaScript: Correct zIndex for tooltip
Dan Poltawski [Thu, 25 Apr 2013 13:53:18 +0000 (14:53 +0100)]
Merge branch 'wip-MDL-39305-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 25 Apr 2013 12:06:52 +0000 (13:06 +0100)]
Merge branch 'MDL-38889-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Thu, 25 Apr 2013 11:49:38 +0000 (12:49 +0100)]
Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle
Jerome Mouneyrac [Wed, 10 Apr 2013 03:50:56 +0000 (11:50 +0800)]
MDL-37988 Completion reports: Table header row not in thead section
Dan Poltawski [Thu, 25 Apr 2013 09:19:45 +0000 (10:19 +0100)]
Merge branch 'MDL-29258_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 25 Apr 2013 09:09:52 +0000 (10:09 +0100)]
Merge branch 'MDL-39329-master' of git://github.com/FMCorz/moodle
Mary Evans [Thu, 25 Apr 2013 02:13:53 +0000 (03:13 +0100)]
MDL-39250 theme_clean: Removed 2 instances of id="region-pre" from aside tags in layout/general.php.
AMOS bot [Thu, 25 Apr 2013 00:38:05 +0000 (00:38 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 23:07:27 +0000 (01:07 +0200)]
on demand release 2.5beta+
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 23:02:41 +0000 (01:02 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 22:28:30 +0000 (00:28 +0200)]
MDL-39276 theme_clean: Move favicon from old simple
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 22:27:03 +0000 (00:27 +0200)]
Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 22:01:32 +0000 (00:01 +0200)]
MDL-39138 theme_bootstrap: whitespace line
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 22:00:23 +0000 (00:00 +0200)]
Merge branch 'wip-MDL-39138-master' of git://github.com/ds125v/moodle
Conflicts:
theme/bootstrap/style/generated.css
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 21:35:46 +0000 (23:35 +0200)]
Merge branch 'MDL-35364' of git://github.com/timhunt/moodle
Mary Evans [Wed, 24 Apr 2013 20:35:15 +0000 (21:35 +0100)]
MDL-39276 theme_clean: Renamed Simple theme to Clean theme.
Matt Petro [Tue, 16 Apr 2013 11:19:23 +0000 (07:19 -0400)]
MDL-34403 mod quiz: fix error during enrolment
Dan Poltawski [Wed, 24 Apr 2013 13:33:00 +0000 (14:33 +0100)]
Merge branch 'MDL-39283' of git://github.com/jmvedrine/moodle
David Scotson [Wed, 24 Apr 2013 13:01:34 +0000 (14:01 +0100)]
MDL-39138 theme_bootstrap: Revert Settings/Nav styles
Dan Poltawski [Wed, 24 Apr 2013 10:47:08 +0000 (11:47 +0100)]
Merge branch 'wip-MDL-39297-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 24 Apr 2013 10:39:08 +0000 (11:39 +0100)]
Merge branch 'MDL-38415-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 24 Apr 2013 09:02:41 +0000 (10:02 +0100)]
MDL-38597 forum: fix incompetent programmer error ;-)
Shameful, Fred!
Dan Poltawski [Wed, 24 Apr 2013 08:57:22 +0000 (09:57 +0100)]
Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 24 Apr 2013 08:53:25 +0000 (09:53 +0100)]
Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 24 Apr 2013 08:10:43 +0000 (16:10 +0800)]
MDL-32946: Be consistent with use of alt/title.
Re: Block dock/undock links.
Damyon Wiese [Wed, 24 Apr 2013 08:10:30 +0000 (16:10 +0800)]
Merge branch 'wip-MDL-32946-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 24 Apr 2013 08:08:23 +0000 (09:08 +0100)]
Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
Dan Poltawski [Wed, 24 Apr 2013 07:16:37 +0000 (08:16 +0100)]
Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle
Damyon Wiese [Wed, 24 Apr 2013 07:01:35 +0000 (15:01 +0800)]
Merge branch 'MDL-34939-master' of https://github.com/lucisgit/moodle
Mark Nelson [Wed, 24 Apr 2013 04:24:20 +0000 (12:24 +0800)]
MDL-39192 mod_forum: do not need to check the posting threshold when editing a post
Rossiani Wijaya [Wed, 24 Apr 2013 05:49:09 +0000 (13:49 +0800)]
MDL-38892 data module: Fixed action setType to use PARAM_ALPHANUM
Jason Fowler [Fri, 8 Mar 2013 06:28:28 +0000 (14:28 +0800)]
MDL-32946 - Blocks - Improving image alts for accessibility.
Damyon Wiese [Wed, 24 Apr 2013 04:53:16 +0000 (12:53 +0800)]
Merge branch 'wip-MDL-39326-m25' of git://github.com/samhemelryk/moodle
Frederic Massart [Wed, 24 Apr 2013 03:47:08 +0000 (11:47 +0800)]
MDL-39329 course: Strict standard warning during unpublishing
Damyon Wiese [Wed, 24 Apr 2013 03:39:13 +0000 (11:39 +0800)]
Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 23 Apr 2013 07:28:19 +0000 (15:28 +0800)]
MDL-38851 Admin: Fixed setType notice for cache
Rajesh Taneja [Tue, 23 Apr 2013 07:23:00 +0000 (15:23 +0800)]
MDL-38851 Admin: Fixed setType notice for webservice
Sam Hemelryk [Wed, 24 Apr 2013 01:55:44 +0000 (13:55 +1200)]
MDL-39326 css: removed unused chunk array search
Sam Hemelryk [Wed, 24 Apr 2013 01:52:48 +0000 (13:52 +1200)]
MDL-39326 css: no passed the no svg key to chunking when required
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 00:09:34 +0000 (02:09 +0200)]
MDL-38972 xmldb: amend comments.
Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 00:02:20 +0000 (02:02 +0200)]
Merge branch 'w16_MDL-38972_m25_oraindex' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Apr 2013 21:41:47 +0000 (23:41 +0200)]
Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle
Davo Smith [Tue, 23 Apr 2013 17:58:09 +0000 (18:58 +0100)]
MDL-39219 mod_scorm - make sure YUI JSON module is loaded
Dan Poltawski [Tue, 23 Apr 2013 12:00:30 +0000 (13:00 +0100)]
Merge branch 'MDL-37784' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 23 Apr 2013 11:50:44 +0000 (12:50 +0100)]
Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle