David Mudrak [Sat, 3 Dec 2011 13:11:26 +0000 (14:11 +0100)]
MDL-30340 Block stickiness computation improvements
This is an attempt to clean up and fix the computation of the block
stickiness. At first, the page pattern can't be ignored because the user
may want to currently try to limit the page pattern. Second, the
site-index pattern can be forced only if the user selected 'Front page
only' as the page context.
David Mudrak [Sat, 3 Dec 2011 13:08:52 +0000 (14:08 +0100)]
MDL-30340 Always generate pagetype patterns in the block settings form
This is an alternative solution to MDL-27812. If the current block
instance has page type set to site-index, we need to provide a way how
that page type pattern can be reset back to other value.
David Mudrak [Sat, 3 Dec 2011 13:07:44 +0000 (14:07 +0100)]
MDL-30340 Trivial change in PHP doc block - the function does not accept any params
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 11:12:21 +0000 (12:12 +0100)]
Moodle release 2.2rc1
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 11:04:08 +0000 (12:04 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 09:38:40 +0000 (10:38 +0100)]
Merge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle
Andrew Davis [Thu, 1 Dec 2011 08:54:48 +0000 (16:54 +0800)]
MDL-30544 message: prevented the temporarily disable notifications checkbox from erasing your messaging preferences
Jerome Mouneyrac [Thu, 1 Dec 2011 06:19:36 +0000 (14:19 +0800)]
MDL-30496 fix upload max size issue when server limit is set + return some kind of json error object for filenameexists and oversizedfile errors
Sam Hemelryk [Thu, 1 Dec 2011 04:14:52 +0000 (17:14 +1300)]
Merge branch 'MDL-30007' of git://github.com/stronk7/moodle
Aparup Banerjee [Thu, 1 Dec 2011 04:03:31 +0000 (12:03 +0800)]
MDL-30386 blog : saved a function call
Aparup Banerjee [Thu, 1 Dec 2011 03:54:25 +0000 (11:54 +0800)]
Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Thu, 1 Dec 2011 03:24:47 +0000 (11:24 +0800)]
Merge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle
Jerome Mouneyrac [Thu, 1 Dec 2011 02:33:37 +0000 (10:33 +0800)]
MDL-30459 when one filename already exist we bypass the execution and continue. We just return the error into the json string
Sam Hemelryk [Thu, 1 Dec 2011 02:48:20 +0000 (15:48 +1300)]
Merge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Thu, 1 Dec 2011 01:43:39 +0000 (14:43 +1300)]
Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes
Sam Hemelryk [Thu, 1 Dec 2011 01:17:10 +0000 (14:17 +1300)]
MDL-30376 mod_glossary: Integration tidy up
Sam Hemelryk [Thu, 1 Dec 2011 01:16:19 +0000 (14:16 +1300)]
Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle
Jason Fowler [Wed, 30 Nov 2011 03:22:13 +0000 (11:22 +0800)]
MDL-30386 - Blog - Adding RSS Feed link to the User blogs
Sam Hemelryk [Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)]
Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 23:36:09 +0000 (00:36 +0100)]
MDL-30007 standardise assignment subplugin lang files
Sam Hemelryk [Wed, 30 Nov 2011 23:29:19 +0000 (12:29 +1300)]
Merge branch 'MDL-29730' of git://github.com/rwijaya/moodle
Sam Hemelryk [Wed, 30 Nov 2011 23:15:29 +0000 (12:15 +1300)]
Merge branch 'MDL-30453-exassessment-link' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 23:14:42 +0000 (00:14 +0100)]
MDL-30007 standardise mnet service version files
Sam Hemelryk [Wed, 30 Nov 2011 22:48:55 +0000 (11:48 +1300)]
Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle
Ruslan Kabalin [Wed, 30 Nov 2011 17:17:12 +0000 (17:17 +0000)]
MDL-30526 Choice: add form validation rule for numeric field
Aparup Banerjee [Wed, 30 Nov 2011 09:47:18 +0000 (17:47 +0800)]
Merge branch 'MDL-30494_tokenize_test' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Wed, 30 Nov 2011 09:39:23 +0000 (17:39 +0800)]
Merge branch 'w49_MDL-30517_m22_blockdelete' of git://github.com/skodak/moodle
Petr Skoda [Wed, 30 Nov 2011 07:49:18 +0000 (08:49 +0100)]
MDL-30517 use alternative block delete to prevent upgrade problems
Aparup Banerjee [Wed, 30 Nov 2011 07:44:16 +0000 (15:44 +0800)]
MDL-30202 forum : whitespace cleanup
Aparup Banerjee [Wed, 30 Nov 2011 07:36:14 +0000 (15:36 +0800)]
Merge branch 'MDL-30202' of git://github.com/rwijaya/moodle
Aparup Banerjee [Wed, 30 Nov 2011 07:16:08 +0000 (15:16 +0800)]
MDL-27334 : summarised comment about problem.
we have git for history.
Jerome Mouneyrac [Fri, 25 Nov 2011 04:05:53 +0000 (12:05 +0800)]
MDL-30459 better error message when file already exist
Aparup Banerjee [Wed, 30 Nov 2011 07:01:25 +0000 (15:01 +0800)]
Merge branch 'wip-MDL-27334-master' of git://github.com/abgreeve/moodle
Jason Fowler [Wed, 30 Nov 2011 06:36:22 +0000 (14:36 +0800)]
MDL-30376 - Glossary - Fixing ability to see the RSS feed for a glossary
Aparup Banerjee [Wed, 30 Nov 2011 06:42:04 +0000 (14:42 +0800)]
MDL-29469 Enrolments : fixed whitespaces
Rajesh Taneja [Wed, 30 Nov 2011 05:21:54 +0000 (13:21 +0800)]
MDL-30421 forum: resolved error in single discussion forum, if more then one record is present
Aparup Banerjee [Wed, 30 Nov 2011 06:37:59 +0000 (14:37 +0800)]
Merge branch 'wip-MDL-29469-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Wed, 30 Nov 2011 06:04:14 +0000 (14:04 +0800)]
Merge branch 'MDL-30395' of git://github.com/mouneyrac/moodle
Rossiani Wijaya [Wed, 30 Nov 2011 06:00:33 +0000 (14:00 +0800)]
MDL-30202 forum rss: move check to the end of if statement to prevent unnecessary db process if rss is disable
Andrew Davis [Wed, 30 Nov 2011 03:41:00 +0000 (11:41 +0800)]
MDL-30494 grade: provided a failure string to gives people experiencing UTF character test failures a starting point for fixing the problem
Andrew Davis [Wed, 30 Nov 2011 03:39:25 +0000 (11:39 +0800)]
MDL-30494 grade: improved unit tests for tokenize()
Rossiani Wijaya [Wed, 30 Nov 2011 03:30:09 +0000 (11:30 +0800)]
MDL-29730 Lesson mod: fixed check_answer() for shortanswser with regular expression option enable
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 02:40:21 +0000 (03:40 +0100)]
MDL-30007 standardise data preset subplugin version and lang files
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 02:39:24 +0000 (03:39 +0100)]
MDL-30007 standardise data field subplugin lang files
Jerome Mouneyrac [Wed, 30 Nov 2011 02:33:21 +0000 (10:33 +0800)]
MDL-30395 display the folder name if the block/module of a backup file is not installed in the site
Andrew Davis [Wed, 16 Nov 2011 05:01:55 +0000 (13:01 +0800)]
MDL-30260 message: added /message/upgrade.txt, checked calls to message_send() are supplying user.emailstop and improved message_send() to handle message requests that don't
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 01:59:39 +0000 (02:59 +0100)]
MDL-30007 standardise data field subplugin version files
Eloy Lafuente (stronk7) [Wed, 30 Nov 2011 01:45:21 +0000 (02:45 +0100)]
MDL-30007 standardise user profile field version files
AMOS bot [Wed, 30 Nov 2011 00:31:01 +0000 (00:31 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 30 Nov 2011 00:04:37 +0000 (13:04 +1300)]
Merge branch 'MDL-30440-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 30 Nov 2011 00:02:15 +0000 (13:02 +1300)]
Merge branch 'MDL-30322' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 29 Nov 2011 22:55:55 +0000 (11:55 +1300)]
MDL-30485 whitespace fix
Sam Hemelryk [Tue, 29 Nov 2011 22:49:40 +0000 (11:49 +1300)]
Merge commit 'FETCH_HEAd'
Sam Hemelryk [Tue, 29 Nov 2011 22:05:46 +0000 (11:05 +1300)]
Merged branch 'MDL-30505' of git://github.com/lazydaisy/moodle.git with conflict resolution
Petr Skoda [Tue, 29 Nov 2011 21:29:14 +0000 (22:29 +0100)]
MDL-30007 standardise workshop subplugin version files
Petr Skoda [Tue, 29 Nov 2011 21:21:34 +0000 (22:21 +0100)]
MDL-30007 standardise text editor version files
Petr Skoda [Tue, 29 Nov 2011 21:19:05 +0000 (22:19 +0100)]
MDL-30007 standardise quiz report version files
Petr Skoda [Tue, 29 Nov 2011 21:15:28 +0000 (22:15 +0100)]
MDL-30007 standardise assignment plugin version files
Petr Skoda [Tue, 29 Nov 2011 21:12:15 +0000 (22:12 +0100)]
MDL-30007 standardise webservice version files
Petr Skoda [Tue, 29 Nov 2011 21:06:19 +0000 (22:06 +0100)]
MDL-30007 standardise repository version files
Petr Skoda [Tue, 29 Nov 2011 20:54:11 +0000 (21:54 +0100)]
MDL-30007 standardise portfolio version files
Petr Skoda [Tue, 29 Nov 2011 20:38:14 +0000 (21:38 +0100)]
MDL-30007 standardise module version files
Petr Skoda [Tue, 29 Nov 2011 20:23:18 +0000 (21:23 +0100)]
MDL-30007 standardise messaging plugin version files
Petr Skoda [Tue, 29 Nov 2011 20:20:13 +0000 (21:20 +0100)]
MDL-30007 standardise gradebook plugins version files
Petr Skoda [Tue, 29 Nov 2011 20:15:42 +0000 (21:15 +0100)]
MDL-30007 standardise filter version files
Petr Skoda [Tue, 29 Nov 2011 20:08:57 +0000 (21:08 +0100)]
MDL-30007 standardise enrol plugins version info
Petr Skoda [Tue, 29 Nov 2011 20:02:13 +0000 (21:02 +0100)]
MDL-30007 standardise admin tool version info
Petr Skoda [Tue, 29 Nov 2011 19:57:30 +0000 (20:57 +0100)]
MDL-30007 standard version file for all blocks
Petr Skoda [Tue, 29 Nov 2011 19:41:21 +0000 (20:41 +0100)]
MDL-30007 add/fix version files for all auth plugins
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 19:09:37 +0000 (20:09 +0100)]
on-demand release 2.2beta+
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 19:07:36 +0000 (20:07 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 18:47:25 +0000 (19:47 +0100)]
MDL-30466 Backup: delete empty method
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 18:45:39 +0000 (19:45 +0100)]
Merge branch 'wip-mdl-30466' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 15:39:22 +0000 (16:39 +0100)]
Merge branch 'MDL-30444' of git://github.com/kiklop74/moodle
Mary Evans [Tue, 29 Nov 2011 15:21:09 +0000 (15:21 +0000)]
MDL-30505 Fix for nested mixed ordered/unordered lists
Eloy Lafuente (stronk7) [Tue, 29 Nov 2011 14:54:28 +0000 (15:54 +0100)]
Merge branch 'MDL-30435' of git://github.com/kiklop74/moodle
Chris Scribner [Mon, 28 Nov 2011 19:00:52 +0000 (14:00 -0500)]
MDL-30400 lti: Fixing warning in OAuthBodyPost
This would have only shown up if the tool provider didn't set the
content-type header, which I don't think is valid to begin with.
(amended by integrator to follow coding style rules)
Aparup Banerjee [Tue, 29 Nov 2011 10:35:25 +0000 (18:35 +0800)]
MDL-28646 webservices : version bump
Aparup Banerjee [Tue, 29 Nov 2011 08:38:02 +0000 (16:38 +0800)]
Merge branch 'wip-MDL-28646' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 29 Nov 2011 03:56:29 +0000 (16:56 +1300)]
Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 29 Nov 2011 03:54:00 +0000 (16:54 +1300)]
MDL-26240 theme_anomaly: Fixed small regression with dock
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
Jerome Mouneyrac [Tue, 29 Nov 2011 03:18:36 +0000 (11:18 +0800)]
MDL-28646 add missing authentication web service checks. Merge download/upload script checks in the same lib functions. Make the download scrit return json error message. Add missing webservice lang. Minor unit test doc improvement.
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
AMOS bot [Tue, 29 Nov 2011 00:30:40 +0000 (00:30 +0000)]
Automatically generated installer lang files
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.
Tim Hunt [Mon, 28 Nov 2011 17:26:17 +0000 (17:26 +0000)]
MDL-30485 XML import from 1.9 does not handle files in subfolders.
Andrew Robert Nicols [Wed, 16 Nov 2011 12:06:24 +0000 (12:06 +0000)]
MDL-30302 Adjust options for calendar day settings
Tim Hunt [Thu, 17 Nov 2011 14:35:57 +0000 (14:35 +0000)]
MDL-30322 qtypes calc* and mulitanswer -> optional_param_array.
Rossiani Wijaya [Mon, 28 Nov 2011 09:49:14 +0000 (17:49 +0800)]
MDL-30202 forum module: fixed code regression for displaying rss feed icon (link)
Aparup Banerjee [Mon, 28 Nov 2011 09:02:26 +0000 (17:02 +0800)]
Merge branch 'wip-MDL-30214-master' of github.com:marinaglancy/moodle
