Sam Hemelryk [Tue, 29 Nov 2011 03:52:50 +0000 (16:52 +1300)]
Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 29 Nov 2011 03:47:21 +0000 (16:47 +1300)]
MDL-30273 whitespace cleanup
Sam Hemelryk [Tue, 29 Nov 2011 03:46:47 +0000 (16:46 +1300)]
Merge branch 'wip-MDL-30273-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 29 Nov 2011 03:28:24 +0000 (16:28 +1300)]
Merge branch 'MDL-30471' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Tue, 29 Nov 2011 03:27:53 +0000 (11:27 +0800)]
Merge branch 'MDL-30368' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 02:18:02 +0000 (03:18 +0100)]
Merge branch 'wip-MDL-30378-m22' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 29 Nov 2011 02:16:27 +0000 (15:16 +1300)]
Merge branch 'MDL-30347' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 01:57:02 +0000 (02:57 +0100)]
MDL-30347 lti: disabling outated/incorrect unit tests
Sam Hemelryk [Tue, 29 Nov 2011 00:51:25 +0000 (13:51 +1300)]
Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes
Sam Hemelryk [Mon, 28 Nov 2011 22:01:50 +0000 (11:01 +1300)]
MDL-30378 navigation: Front page activities are now added to the navigation on every page
Eloy Lafuente (stronk7) [Mon, 28 Nov 2011 19:18:43 +0000 (20:18 +0100)]
Merge branch 'w48_MDL-30487_m22_filtertest' of git://github.com/skodak/moodle
Petr Skoda [Mon, 28 Nov 2011 19:11:59 +0000 (20:11 +0100)]
MDL-30487 remove obsolete test
Since MDL-30303 media filter accepts any ? parameters.
Aparup Banerjee [Mon, 28 Nov 2011 09:02:26 +0000 (17:02 +0800)]
Merge branch 'wip-MDL-30214-master' of github.com:marinaglancy/moodle
Aparup Banerjee [Mon, 28 Nov 2011 07:21:34 +0000 (15:21 +0800)]
Merge branch 'MDL-30379' of git://github.com/rwijaya/moodle
Aparup Banerjee [Thu, 24 Nov 2011 03:31:11 +0000 (11:31 +0800)]
MDL-30243 theme - whitespace fixes to afterburner
Aparup Banerjee [Mon, 28 Nov 2011 06:33:57 +0000 (14:33 +0800)]
Merge branch 'MDL-30243' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Nov 2011 05:54:49 +0000 (18:54 +1300)]
Merge branch 'w48_MDL-30448_m22_urlpar' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Nov 2011 05:21:39 +0000 (18:21 +1300)]
Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Nov 2011 05:13:27 +0000 (18:13 +1300)]
Merge branch 'w48_MDL-30467_m22_delusers' of git://github.com/skodak/moodle
Marina Glancy [Mon, 28 Nov 2011 03:51:55 +0000 (11:51 +0800)]
MDL-30214: Added function forum_get_file_info() to fix the bug with choosing recent forum files in filepicker
Aparup Banerjee [Mon, 28 Nov 2011 03:43:03 +0000 (11:43 +0800)]
Merge branch 'MDL-30460-master' of git://github.com/ankitagarwal/moodle
Rossiani Wijaya [Mon, 21 Nov 2011 09:26:19 +0000 (17:26 +0800)]
MDL-30368 box.net plugins: add richhtml format as part of box.net supported formats
Rossiani Wijaya [Tue, 22 Nov 2011 02:27:33 +0000 (10:27 +0800)]
MDL-30379 survey module: change clean_param() to clean_param_array()
Mary Evans [Sun, 27 Nov 2011 23:53:15 +0000 (23:53 +0000)]
MDL-30471 Fix for nesting unordered list inside ordered list
Eloy Lafuente (stronk7) [Sun, 27 Nov 2011 23:08:31 +0000 (00:08 +0100)]
Merge branch 'dropbox-api-bump-for-master' of git://git.luns.net.uk/moodle
Mary Evans [Sun, 27 Nov 2011 00:46:24 +0000 (00:46 +0000)]
MDL-26240 Fixes for Anomaly theme inconsistency
Petr Skoda [Sat, 26 Nov 2011 12:39:22 +0000 (13:39 +0100)]
MDL-30448 fix url param problems
Petr Skoda [Sat, 26 Nov 2011 08:07:23 +0000 (09:07 +0100)]
MDL-30467 notify devs deleted users do not have context
Petr Skoda [Sat, 26 Nov 2011 08:07:00 +0000 (09:07 +0100)]
MDL-30467 skip deleted users during pix upgrade
Petr Skoda [Fri, 25 Nov 2011 07:50:45 +0000 (08:50 +0100)]
MDL-30467 do profiles in tags for deleted users
Petr Skoda [Fri, 25 Nov 2011 07:46:38 +0000 (08:46 +0100)]
MDL-30467 no system profile for deleted users
Petr Skoda [Fri, 25 Nov 2011 07:46:20 +0000 (08:46 +0100)]
MDL-30467 no course profile for deleted users
Petr Skoda [Fri, 25 Nov 2011 07:26:57 +0000 (08:26 +0100)]
MDL-30457 do not show pictures of deleted users
Since 2.2 deleted users do not have contexts.
Dan Poltawski [Fri, 25 Nov 2011 09:51:33 +0000 (09:51 +0000)]
MDL-29960 repository/dropbox - Fix obvious incorrect url
Eloy Lafuente (stronk7) [Fri, 25 Nov 2011 10:11:33 +0000 (11:11 +0100)]
on-demand release 2.2beta+
Eloy Lafuente (stronk7) [Fri, 25 Nov 2011 10:05:27 +0000 (11:05 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Fri, 25 Nov 2011 09:47:32 +0000 (09:47 +0000)]
MDL-29960 repository/dropbox - remove unsused code
This function calls an API request which may be changed from the
version 0 of the API
Dan Poltawski [Fri, 25 Nov 2011 09:45:43 +0000 (09:45 +0000)]
MDL-29960 repository/dropbox - update to use 1.0 API version
Ankit Kumar Agarwal [Fri, 25 Nov 2011 09:10:09 +0000 (14:40 +0530)]
MDL-30460 Wiki making file extension case-insensitive
Aparup Banerjee [Fri, 25 Nov 2011 03:59:10 +0000 (11:59 +0800)]
Merge branch 'MDL-30428-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Fri, 25 Nov 2011 02:22:09 +0000 (03:22 +0100)]
Merge branch 'MDL-30456' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Fri, 25 Nov 2011 02:14:51 +0000 (03:14 +0100)]
MDL-30456 backup - avoid missing deleted users on backup
AMOS bot [Fri, 25 Nov 2011 00:30:42 +0000 (00:30 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Fri, 25 Nov 2011 00:13:06 +0000 (13:13 +1300)]
Merge branch 'MDL-30422-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Fri, 25 Nov 2011 00:07:27 +0000 (01:07 +0100)]
MDL-27233 move the restorer enrol/ra creation to the very beginning of the restore process
Some early steps in restore are using capability checks to decide how to
restore some information. But at that stage, if the course contents have
been removed and the user had perms at course level only (usually teacher)
the process can fail because some content is not restoreable due to the
lack of permissions.
Moving the restorer step to the beginning really helps is those situations
and it does not hurt at all.
Also, fixed one notice detected when testing this.
Eloy Lafuente (stronk7) [Thu, 24 Nov 2011 23:59:59 +0000 (00:59 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration
Sam Hemelryk [Thu, 24 Nov 2011 22:53:24 +0000 (11:53 +1300)]
Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Thu, 24 Nov 2011 22:44:24 +0000 (23:44 +0100)]
Merge branch 'w47_MDL-27233_m22_restoreenrol' of git://github.com/skodak/moodle
Sam Hemelryk [Thu, 24 Nov 2011 22:29:33 +0000 (11:29 +1300)]
Merge branch 'wip-mdl-30391' of git://github.com/rajeshtaneja/moodle
Mary Evans [Wed, 23 Nov 2011 11:29:13 +0000 (11:29 +0000)]
MDL-28625 - removed ul/ol styles from canvas/text.css
Petr Skoda [Thu, 24 Nov 2011 09:40:38 +0000 (10:40 +0100)]
MDL-27233 fix variable names
Thanks Eloy!
Mary Evans [Thu, 24 Nov 2011 09:31:32 +0000 (09:31 +0000)]
MDL-30243 - corrected admin tree to add custom css settings
Aparup Banerjee [Thu, 24 Nov 2011 08:14:37 +0000 (16:14 +0800)]
Merge branch 'MDL-30288_override_checkbox' of git://github.com/andyjdavis/moodle
Ankit Kumar Agarwal [Thu, 24 Nov 2011 04:44:47 +0000 (10:14 +0530)]
MDL-30422 SCORM Fixing old variable use in interraction report
Aparup Banerjee [Thu, 24 Nov 2011 06:39:53 +0000 (14:39 +0800)]
Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle
Andrew Davis [Sat, 19 Nov 2011 06:42:47 +0000 (14:42 +0800)]
MDL-30288 gradebook: prevented grade grade feedback being wrapped in a text to html div tag which was causing it to look like feedback had been edited when it hadn't
AMOS bot [Thu, 24 Nov 2011 00:31:00 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 22:01:27 +0000 (23:01 +0100)]
Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle
Petr Skoda [Fri, 11 Nov 2011 15:08:44 +0000 (16:08 +0100)]
MDL-27233 allow adding of default role to restorers
Petr Skoda [Wed, 9 Nov 2011 09:55:16 +0000 (10:55 +0100)]
MDL-27233 add new options to keep enrols and groups purging existing course in restore
Petr Skoda [Wed, 9 Nov 2011 09:43:10 +0000 (10:43 +0100)]
MDL-29450 improve and cleanup course content removal
New keep roles/enrolments and groups/groupings options, notification CSS fixed, standardised notification texts, added missing delete of module blocks, fixed file deleting and some other minor issues.
Andrew Robert Nicols [Wed, 23 Nov 2011 14:07:52 +0000 (14:07 +0000)]
MDL-30428 Add br tag when showing the 'Export to Portfolio' text
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:37:37 +0000 (13:37 +0100)]
Merge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:33:39 +0000 (13:33 +0100)]
Merge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:28:24 +0000 (13:28 +0100)]
Merge branch 'wip-mdl-30375' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:19:21 +0000 (13:19 +0100)]
Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 12:16:04 +0000 (13:16 +0100)]
Merge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)]
Merge branch 'MDL-29095' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:47:51 +0000 (11:47 +0100)]
Merge branch 'MDL-29060' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:37:34 +0000 (11:37 +0100)]
Merge branch 'wip-mdl-28947' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)]
Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 10:07:50 +0000 (11:07 +0100)]
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
Aparup Banerjee [Wed, 23 Nov 2011 06:34:34 +0000 (14:34 +0800)]
Merge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 23 Nov 2011 05:51:11 +0000 (13:51 +0800)]
MDL-29995 Filters - added MDL issue number to Todo.
Aparup Banerjee [Wed, 23 Nov 2011 05:47:52 +0000 (13:47 +0800)]
Merge branch 'MDL-29995' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 23 Nov 2011 04:36:35 +0000 (12:36 +0800)]
Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle
Aparup Banerjee [Wed, 23 Nov 2011 04:06:58 +0000 (12:06 +0800)]
Merge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 23 Nov 2011 03:52:08 +0000 (16:52 +1300)]
Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle
Aparup Banerjee [Wed, 23 Nov 2011 03:47:06 +0000 (11:47 +0800)]
MDL-30335 formslib : phpdoc improvement
Aparup Banerjee [Wed, 23 Nov 2011 03:41:58 +0000 (11:41 +0800)]
Merge branch 'MDL-30335' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 23 Nov 2011 03:12:03 +0000 (11:12 +0800)]
Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle
Mary Evans [Wed, 9 Nov 2011 17:39:30 +0000 (17:39 +0000)]
MDL-29778 Fix to make user selector arrow visible
Kordan [Thu, 10 Nov 2011 07:03:27 +0000 (08:03 +0100)]
MDL-29830 theme_base: Fix overflow problems with navigation items
Rossiani Wijaya [Tue, 8 Nov 2011 04:13:48 +0000 (12:13 +0800)]
MDL-29115 lesson mod: fixed the display of 'try again' button so it relates to lesson setting
Rajesh Taneja [Tue, 22 Nov 2011 07:25:09 +0000 (15:25 +0800)]
MDL-30375 Blocks: Comments block will show blank textbox rather then hiding and 'add a comment' will be visible if it's empty
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 02:06:18 +0000 (03:06 +0100)]
Merge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 02:01:50 +0000 (03:01 +0100)]
Merge branch 'MDL-27045' of git://github.com/timhunt/moodle
Sam Hemelryk [Wed, 23 Nov 2011 01:11:23 +0000 (14:11 +1300)]
Merge branch 'MDL-30192' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 01:00:53 +0000 (02:00 +0100)]
Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)]
Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)]
Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle
AMOS bot [Wed, 23 Nov 2011 00:30:58 +0000 (00:30 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:20:39 +0000 (01:20 +0100)]
Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:18:00 +0000 (01:18 +0100)]
Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:11:01 +0000 (01:11 +0100)]
Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:07:44 +0000 (01:07 +0100)]
Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 23 Nov 2011 00:04:29 +0000 (01:04 +0100)]
Merge branch 'MDL-30404-stringcaches' of git://github.com/mudrd8mz/moodle
Mary Evans [Wed, 9 Nov 2011 00:32:16 +0000 (00:32 +0000)]
MDL-30164 FIX for missing gap between icon and text in reports
Mary Evans [Sun, 13 Nov 2011 17:19:56 +0000 (17:19 +0000)]
MDL-30196 changed reference from Serenity to Sky High in theme_sky_high.php
Sam Hemelryk [Tue, 22 Nov 2011 23:41:24 +0000 (12:41 +1300)]
Merge branch 'MDL-30393_2' of git://git.catalyst.net.nz/moodle-r2
