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
Sam Hemelryk [Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)]
Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle
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
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
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
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
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
Dongsheng Cai [Fri, 25 Nov 2011 06:44:13 +0000 (14:44 +0800)]
MDL-28646 Web service: core_course_get_contents()
1. Implement core_course_get_contents web service
2. Implement callbacks in folder, resource, page and url modules
3. Implement download script for web service
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
Ankit Kumar Agarwal [Mon, 28 Nov 2011 06:21:37 +0000 (11:51 +0530)]
MDL-30440 SCORM Fixing Sql errors in interraction reporting
Rajesh Taneja [Mon, 28 Nov 2011 06:12:41 +0000 (14:12 +0800)]
MDL-30466 Backup: Fixed duplicate completion record check error
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.
AMOS bot [Sat, 26 Nov 2011 00:31:01 +0000 (00:31 +0000)]
Automatically generated installer lang files
David Mudrak [Fri, 25 Nov 2011 17:35:50 +0000 (18:35 +0100)]
MDL-30453 Use correct renderable classes to represent assessments of example submission
David Mudrak [Fri, 25 Nov 2011 17:27:34 +0000 (18:27 +0100)]
MDL-30453 New renderable classes for assessments of example submissions
The patch introduces two new classes for rendering assessments of
example submission - both the training one and the reference one.
Together with the cooking functions for obtaining instances of these
classes.
David Mudrak [Thu, 24 Nov 2011 16:08:49 +0000 (17:08 +0100)]
MDL-30271 Inform the user about the example assessment conflict, instead of throwing the exception
David Mudrak [Thu, 24 Nov 2011 15:12:40 +0000 (16:12 +0100)]
MDL-30271 Move the page initialization so that we can produce output in param processing sections eventually
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
