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
Mary Evans [Fri, 26 Apr 2013 21:18:26 +0000 (22:18 +0100)]
MDL-39364 theme_clean: Changed 'simple' to 'clean'.
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
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
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
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
Petr Škoda [Tue, 23 Apr 2013 10:36:50 +0000 (12:36 +0200)]
MDL-39306 fix course search regression
Oracle handling of NULLs is totally wrong and crazy!
Marina Glancy [Tue, 23 Apr 2013 08:57:21 +0000 (18:57 +1000)]
MDL-39305 fixed display bugs in course listings
- When category has a lot of subcategories and courses and user clicks 'view more' for categories, the courses are still displayed
- Course summary non-image files may appear above course summary image files, and they don't have an icon with the filetype
Jean-Michel Vedrine [Mon, 22 Apr 2013 14:21:54 +0000 (16:21 +0200)]
MDL-39283 GIFT and XML question export broken for unsupported qtypes
Do no write any data to the export for unsupported qtypes
Frederic Massart [Mon, 22 Apr 2013 02:25:02 +0000 (10:25 +0800)]
MDL-38597 forum: Reformat the module settings form
Jean-Michel Vedrine [Mon, 22 Apr 2013 11:40:29 +0000 (13:40 +0200)]
MDL-37784 Adaptive no penalty display wrong penalty info
Adaptive Mode tells students they have been penalized even when set to no penalties
Rajesh Taneja [Tue, 23 Apr 2013 06:17:39 +0000 (14:17 +0800)]
MDL-38851 Admin: Fixed setType notice for portfolio
Damyon Wiese [Tue, 23 Apr 2013 04:15:17 +0000 (12:15 +0800)]
MDL-34933 Fix bad merge (grr)
Ankit Agarwal [Tue, 23 Apr 2013 03:39:35 +0000 (11:39 +0800)]
MDL-39296 scorm reports: Fix undefined variables in graphs report
Adrian Greeve [Tue, 23 Apr 2013 03:55:21 +0000 (11:55 +0800)]
MDL-39298 - gradebook: Added more delimiters for uploading and downloading the gradebook as a csv file.
New delimiters added: colon, semicolon
David Monllao [Tue, 23 Apr 2013 03:12:51 +0000 (11:12 +0800)]
MDL-29258 core_portfolio: Fixing broken default breadcrumb
Marina Glancy [Tue, 23 Apr 2013 02:45:22 +0000 (12:45 +1000)]
MDL-39297 fixed mistype in tag name label
Frederic Massart [Tue, 23 Apr 2013 02:11:55 +0000 (10:11 +0800)]
MDL-38415 course: Renaming course overview files to course summary files
Frederic Massart [Thu, 18 Apr 2013 00:29:51 +0000 (08:29 +0800)]
MDL-38415 admin: Reorder default course settings
Frederic Massart [Wed, 17 Apr 2013 07:11:58 +0000 (15:11 +0800)]
MDL-38415 course: Heavy redesign of the course settings form
Frederic Massart [Wed, 17 Apr 2013 05:12:36 +0000 (13:12 +0800)]
MDL-38415 course: Reformat edit form
AMOS BEGIN
MOV [availability_help,core],[visible_help,core]
MOV [category_help,core],[coursecategory_help,core]
AMOS END
Rossiani Wijaya [Wed, 17 Apr 2013 04:26:49 +0000 (12:26 +0800)]
MDL-38892 data module: Fixed setType warning
Damyon Wiese [Tue, 23 Apr 2013 01:20:05 +0000 (09:20 +0800)]
Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle
Conflicts:
lib/db/upgrade.php
version.php
Damyon Wiese [Tue, 23 Apr 2013 00:59:10 +0000 (08:59 +0800)]
Merge branch 'wip-MDL-39294-m25' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 22 Apr 2013 22:17:03 +0000 (10:17 +1200)]
Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 22 Apr 2013 21:41:40 +0000 (09:41 +1200)]
MDL-39294 cache: added missing setType calls to admin forms
Tim Hunt [Mon, 22 Apr 2013 18:21:40 +0000 (19:21 +0100)]
MDL-35364 shorten text: don't return invalid HTML.
I also broke the unit tests into more, smaller, named tests, so that
when things start failing, more tests are run, and it is clearer what
the problem is.
In a couple of cases, I adjusted the $ideal lenght in the test. A
careful counting of the characters in the test input (added as comments)
suggests that the new values make for better tests.
Dan Poltawski [Mon, 22 Apr 2013 16:23:43 +0000 (17:23 +0100)]
Merge branch 'MDL-39264-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 22 Apr 2013 16:00:49 +0000 (17:00 +0100)]
MDL-39281 portfolio: missing setType call
Dan Poltawski [Mon, 22 Apr 2013 13:41:34 +0000 (14:41 +0100)]
Merge branch 'w16_MDL-39213_m25_userupload' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 22 Apr 2013 13:34:51 +0000 (14:34 +0100)]
MDL-39003 - version bump
Dan Poltawski [Mon, 22 Apr 2013 13:33:28 +0000 (14:33 +0100)]
Merge branch 'MDL-39148-uninstall' of git://github.com/mudrd8mz/moodle
Conflicts:
theme/bootstrap/style/generated.css
Dan Poltawski [Mon, 22 Apr 2013 13:20:58 +0000 (14:20 +0100)]
MDL-37514 mod_quiz: fix trailing whitespace
Alex Leontiev [Sat, 20 Apr 2013 07:32:27 +0000 (15:32 +0800)]
MDL-37514 module.js: fix .js for auto quiz submission in preview mode
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.
It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.
Conflicts:
mod/quiz/module.js
Dan Poltawski [Mon, 22 Apr 2013 13:00:53 +0000 (14:00 +0100)]
MDL-39178 theme_nimble: fix whitespace
Dan Poltawski [Mon, 22 Apr 2013 12:59:28 +0000 (13:59 +0100)]
MDL-39178 theme_magazine: fix whitespace
Dan Poltawski [Mon, 22 Apr 2013 12:57:57 +0000 (13:57 +0100)]
Merge branch 'w16_MDL-39178_m25_themesettings' of git://github.com/skodak/moodle
Mike Churchward [Wed, 17 Apr 2013 14:48:32 +0000 (10:48 -0400)]
MDL-34933 core_message: Adding index to improve database access on message_working table.
Dan Poltawski [Mon, 22 Apr 2013 12:12:48 +0000 (13:12 +0100)]
Merge branch 'MDL-39249-upgrade-wizard' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 22 Apr 2013 12:07:45 +0000 (13:07 +0100)]
Merge branch 'MDL-39248-plugins-check' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 22 Apr 2013 12:05:53 +0000 (13:05 +0100)]
Merge branch 'MDL-39186' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Apr 2013 11:47:10 +0000 (12:47 +0100)]
Merge branch 'MDL-38603-workshop-form' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 22 Apr 2013 11:42:10 +0000 (12:42 +0100)]
Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle
Dan Poltawski [Mon, 22 Apr 2013 11:38:47 +0000 (12:38 +0100)]
Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 22 Apr 2013 10:41:41 +0000 (11:41 +0100)]
Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle
