moodle.git
10 years agoMDL-30381 install_init_dataroot() now creates temp and cache
David Mudrak [Mon, 21 Nov 2011 15:49:40 +0000 (16:49 +0100)]
MDL-30381 install_init_dataroot() now creates temp and cache

This prevents PHP warnings displayed due to recent modifications in
make_temp_dir() and make_cache_dir(). These functions now expect that
the root temp/cache dir already exists. So they must be available before
the lang_installer installs the lang pack during install.

10 years agoMDL-30381 Fixed the tempdir and cachedir value calculation
David Mudrak [Mon, 21 Nov 2011 15:01:18 +0000 (16:01 +0100)]
MDL-30381 Fixed the tempdir and cachedir value calculation

Instead of using the default dataroot location, the tempdir and cachedir
are now set under the real dataroot location specified via the argument
and/or the interactive session.

The patch also adds a PARAM_PATH check for the dataroot specified.

10 years agoMDL-30381 Fixed path to the cache directory in installers
David Mudrak [Mon, 21 Nov 2011 10:49:51 +0000 (11:49 +0100)]
MDL-30381 Fixed path to the cache directory in installers

This fixes the patch f848c0f6e60c4451a0058d87194f326bca690c1e introduced
in MDL-29351.

10 years agoon-demand release 2.2beta
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 00:20:35 +0000 (01:20 +0100)]
on-demand release 2.2beta

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 18 Nov 2011 00:17:52 +0000 (01:17 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-29350 Prevent memory/time problems if there are zillions of combinations
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 19:10:02 +0000 (20:10 +0100)]
MDL-29350 Prevent memory/time problems if there are zillions of combinations

10 years agoMerge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)]
Merge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-30182' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)]
Merge branch 'MDL-30182' of git://github.com/timhunt/moodle

10 years agoMDL-30182 fix missing include. Sorry.
Tim Hunt [Thu, 17 Nov 2011 08:02:20 +0000 (08:02 +0000)]
MDL-30182 fix missing include. Sorry.

10 years agoMerge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Thu, 17 Nov 2011 01:53:38 +0000 (14:53 +1300)]
Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 17 Nov 2011 00:55:25 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMerge branch 'MDL-29743' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2011 00:22:22 +0000 (01:22 +0100)]
Merge branch 'MDL-29743' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Thu, 17 Nov 2011 00:11:46 +0000 (13:11 +1300)]
Merge branch 'MDL-29893-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-30069' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:45:00 +0000 (00:45 +0100)]
Merge branch 'MDL-30069' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30122' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:33:54 +0000 (00:33 +0100)]
Merge branch 'MDL-30122' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30167' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:29:18 +0000 (00:29 +0100)]
Merge branch 'MDL-30167' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30182' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:18:25 +0000 (00:18 +0100)]
Merge branch 'MDL-30182' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30186' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)]
Merge branch 'MDL-30186' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30199' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:08:18 +0000 (00:08 +0100)]
Merge branch 'MDL-30199' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30266-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:05:45 +0000 (00:05 +0100)]
Merge branch 'MDL-30266-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-30209' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:02:02 +0000 (00:02 +0100)]
Merge branch 'MDL-30209' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-30300' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 23:00:12 +0000 (00:00 +0100)]
Merge branch 'MDL-30300' of git://github.com/timhunt/moodle

10 years agoMDL-27516 Several CSS fixes for right to left languages
Nadav Kavalerchik [Wed, 16 Nov 2011 22:28:07 +0000 (11:28 +1300)]
MDL-27516 Several CSS fixes for right to left languages

10 years agoMerge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)]
Merge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)]
Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle

10 years agoMDL-30300 qbehaviours: convert to the new is_compatible_question API.
Tim Hunt [Wed, 16 Nov 2011 11:07:35 +0000 (11:07 +0000)]
MDL-30300 qbehaviours: convert to the new is_compatible_question API.

10 years agoMDL-30300 question behaviours: improve q compatibility API.
Tim Hunt [Wed, 16 Nov 2011 10:52:19 +0000 (10:52 +0000)]
MDL-30300 question behaviours: improve q compatibility API.

10 years agoMDL-29893 Fixing issues with password generation function
Ankit Kumar Agarwal [Thu, 10 Nov 2011 08:16:43 +0000 (13:46 +0530)]
MDL-29893 Fixing issues with password generation function

10 years agoMDL-30279 SCORM Fixing sql errors during cron
Ankit Kumar Agarwal [Wed, 16 Nov 2011 04:17:00 +0000 (09:47 +0530)]
MDL-30279 SCORM Fixing sql errors during cron

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 16 Nov 2011 00:55:51 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-30275 Assignment activity description not displayed on course page
sam marshall [Tue, 15 Nov 2011 15:24:08 +0000 (15:24 +0000)]
MDL-30275 Assignment activity description not displayed on course page

10 years agoMDL-30274 Correct typo of loginpage variable
Andrew Robert Nicols [Tue, 15 Nov 2011 15:16:47 +0000 (15:16 +0000)]
MDL-30274 Correct typo of loginpage variable

10 years agoMDL-30266 completionlib fix unit test breakage (regression)
sam marshall [Tue, 15 Nov 2011 10:27:10 +0000 (10:27 +0000)]
MDL-30266 completionlib fix unit test breakage (regression)

10 years agoMDL-30182 quiz grade.php should support userid param.
Tim Hunt [Wed, 9 Nov 2011 13:56:03 +0000 (13:56 +0000)]
MDL-30182 quiz grade.php should support userid param.

10 years agoMDL-30209 quiz refers to wrong rendere method in two places.
Tim Hunt [Thu, 10 Nov 2011 12:51:24 +0000 (12:51 +0000)]
MDL-30209 quiz refers to wrong rendere method in two places.

Thanks to Dan Marsden for working out the fix.

10 years agoMDL-30199 qtype numerical etc. Don't require tolerance for answer *.
Tim Hunt [Wed, 9 Nov 2011 12:51:01 +0000 (12:51 +0000)]
MDL-30199 qtype numerical etc. Don't require tolerance for answer *.

10 years agoMDL-30186 qtype editing forms should use advcheckbox.
Tim Hunt [Tue, 8 Nov 2011 15:57:18 +0000 (15:57 +0000)]
MDL-30186 qtype editing forms should use advcheckbox.

10 years agoMDL-30167 qtype_numerical: notice when required unit is not in the answer.
Tim Hunt [Mon, 7 Nov 2011 12:36:19 +0000 (12:36 +0000)]
MDL-30167 qtype_numerical: notice when required unit is not in the answer.

10 years agoMDL-30185 question engine reporting: add redundant where to query for perf.
Tim Hunt [Tue, 8 Nov 2011 16:53:15 +0000 (16:53 +0000)]
MDL-30185 question engine reporting: add redundant where to query for perf.

Without this, MySQL fails to cope.

10 years agoMDL-30069 Question type icons missing in lots of places.
Tim Hunt [Tue, 8 Nov 2011 15:12:58 +0000 (15:12 +0000)]
MDL-30069 Question type icons missing in lots of places.

10 years agoMDL-29350 Prevent duplication of groupings when copying activities
Henning Bostelmann [Tue, 13 Sep 2011 00:11:19 +0000 (01:11 +0100)]
MDL-29350 Prevent duplication of groupings when copying activities

This patch also includes a database upgrade to correct data produced as a
result of this bug.

10 years agoMDL-29743 quiz: Finish attempt link didn't save responses in some brosers.
Tim Hunt [Wed, 9 Nov 2011 11:45:02 +0000 (11:45 +0000)]
MDL-29743 quiz: Finish attempt link didn't save responses in some brosers.

Thanks to Brandon Browning for identifying the problem. It is quite subtle why this typo would have this effect. You need to look at the implementation of the preventDefault method in lib/yui/3.4.1/build/event-base/event-base.js.

10 years agoMoodle release 2.2beta v2.2.0-beta
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 10:04:15 +0000 (11:04 +0100)]
Moodle release 2.2beta

10 years agoFix permissions
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:58:09 +0000 (10:58 +0100)]
Fix permissions

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:54:40 +0000 (10:54 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 15 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-29956 ims-cc - whitespace cleanup
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 22:35:12 +0000 (23:35 +0100)]
MDL-29956 ims-cc - whitespace cleanup

10 years agoMDL-29956 ims-cc - disabling export and cleaning some unused code
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 20:16:24 +0000 (21:16 +0100)]
MDL-29956 ims-cc - disabling export and cleaning some unused code

This commits cleans some code (settings and dependencies)
and one file included previous by error.

Also it disables all the IMS-CC export feature by default, being
possible to enable it under demand by setting (@ config.php):

$CFG->enablebackupconverters = true;

10 years agoUpdated text conversion to read and store safe xml strings.
Darko Miletic [Sun, 6 Nov 2011 17:39:00 +0000 (14:39 -0300)]
Updated text conversion to read and store safe xml strings.

10 years agoMDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210...
Mark Nielsen [Wed, 26 Oct 2011 17:38:36 +0000 (10:38 -0700)]
MDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210:17265)

Also implemented support for LTI icon during import.

10 years agoMDL-29956: Implement export of Quiz activity (r16977, r17032)
Mark Nielsen [Wed, 26 Oct 2011 17:33:49 +0000 (10:33 -0700)]
MDL-29956: Implement export of Quiz activity (r16977, r17032)

10 years agoMDL-29956: Implement common cartridge export (r16882)
Mark Nielsen [Wed, 26 Oct 2011 17:14:54 +0000 (10:14 -0700)]
MDL-29956: Implement common cartridge export (r16882)

10 years agoMDL-29793 Advanced grading - do not execute the restore step if the grading.xml is...
David Mudrak [Mon, 14 Nov 2011 20:09:52 +0000 (21:09 +0100)]
MDL-29793 Advanced grading - do not execute the restore step if the grading.xml is missing

10 years agoMDL-29793 Advanced grading backup - fixed the recently renamed DB field
David Mudrak [Mon, 14 Nov 2011 20:08:06 +0000 (21:08 +0100)]
MDL-29793 Advanced grading backup - fixed the recently renamed DB field

10 years agoMDL-27622 theme_mymobile: add it to core themes
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:45:48 +0000 (12:45 +0100)]
MDL-27622 theme_mymobile: add it to core themes

10 years agoMerge branch 'lti' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:37:43 +0000 (12:37 +0100)]
Merge branch 'lti' of git://github.com/scriby/moodle

10 years agoMDL-20534 lti: bump version and requires to current before integration, yay!
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:35:52 +0000 (12:35 +0100)]
MDL-20534 lti: bump version and requires to current before integration, yay!

10 years agoMerged MDL-29108 Advanced grading
Sam Hemelryk [Mon, 14 Nov 2011 09:01:05 +0000 (22:01 +1300)]
Merged MDL-29108 Advanced grading

10 years agoMerge pull request #25 from marinaglancy/wip-nov14-rubric
David Mudrak [Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)]
Merge pull request #25 from marinaglancy/wip-nov14-rubric

10 years agoMDL-27036 AICC HACP handling - add missing check for correct user with has_capability.
Dan Marsden [Mon, 14 Nov 2011 08:03:47 +0000 (21:03 +1300)]
MDL-27036 AICC HACP handling - add missing check for correct user with has_capability.

10 years agoMDL-29108: added comments, declared functions visibility, renamed variables; also...
Marina Glancy [Mon, 14 Nov 2011 06:53:14 +0000 (14:53 +0800)]
MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240

10 years agoMDL-30241: fixing Javascript to work in IE as well
Marina Glancy [Mon, 14 Nov 2011 06:48:28 +0000 (14:48 +0800)]
MDL-30241: fixing Javascript to work in IE as well

10 years agoMerge branch 'MDL-28670' of git://github.com/nebgor/moodle
Sam Hemelryk [Mon, 14 Nov 2011 04:49:47 +0000 (17:49 +1300)]
Merge branch 'MDL-28670' of git://github.com/nebgor/moodle

10 years agoMDL-28670 webservice : (review) changes improving performance
Aparup Banerjee [Mon, 14 Nov 2011 03:25:36 +0000 (11:25 +0800)]
MDL-28670 webservice : (review) changes improving performance

10 years agoMerge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 13 Nov 2011 23:10:17 +0000 (12:10 +1300)]
Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle

10 years agoMerge branch 'MDL-30026' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:35:13 +0000 (19:35 +0100)]
Merge branch 'MDL-30026' of git://github.com/stronk7/moodle

10 years agoMDL-30026 improve session lock - stronger detection for oracle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:23:53 +0000 (19:23 +0100)]
MDL-30026 improve session lock - stronger detection for oracle

10 years agoMDL-30026 improve session lock - mssql workaround for bug with scalar returned values
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:06:44 +0000 (19:06 +0100)]
MDL-30026 improve session lock - mssql workaround for bug with scalar returned values

10 years agoMDL-30026 improve session lock - unit tests & minor comment fixup
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:05:57 +0000 (19:05 +0100)]
MDL-30026 improve session lock - unit tests & minor comment fixup

10 years agoAutomatically generated installer lang files
AMOS bot [Sun, 13 Nov 2011 14:14:31 +0000 (15:14 +0100)]
Automatically generated installer lang files

10 years agoMDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid
David Mudrak [Sun, 13 Nov 2011 13:07:33 +0000 (14:07 +0100)]
MDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid

As a response to Sam's review (7.4)

10 years agoMDL-29108 Advanced grading - renaming DB fields formid to definitionid
David Mudrak [Sun, 13 Nov 2011 13:01:57 +0000 (14:01 +0100)]
MDL-29108 Advanced grading - renaming DB fields formid to definitionid

As a response to Sam's review (7.1 and 7.3)

10 years agoMDL-29108 Remove all associated grading areas when the context is being deleted
David Mudrak [Sun, 13 Nov 2011 12:50:00 +0000 (13:50 +0100)]
MDL-29108 Remove all associated grading areas when the context is being deleted

10 years agoAutomatically generated installer lang files
AMOS bot [Sun, 13 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files

10 years agoMDL-27622 theme_mymobile: whitespace fixes
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 19:22:41 +0000 (20:22 +0100)]
MDL-27622 theme_mymobile: whitespace fixes

10 years agoMDL-20534 lti: A8. Removing locallib.php require from lib.php
Chris Scribner [Fri, 11 Nov 2011 18:54:54 +0000 (13:54 -0500)]
MDL-20534 lti: A8. Removing locallib.php require from lib.php

10 years agoMDL-20534 lti: Updating call to lti_add_instance with 2nd argument.
Chris Scribner [Fri, 11 Nov 2011 18:47:53 +0000 (13:47 -0500)]
MDL-20534 lti: Updating call to lti_add_instance with 2nd argument.

10 years agoMDL-20534 lti: Fixing some language in lti's index.php
Chris Scribner [Fri, 11 Nov 2011 18:40:59 +0000 (13:40 -0500)]
MDL-20534 lti: Fixing some language in lti's index.php

10 years agoMDL-20534 lti: Getting rid of references to "Basic" LTI in language file
Chris Scribner [Fri, 11 Nov 2011 18:34:24 +0000 (13:34 -0500)]
MDL-20534 lti: Getting rid of references to "Basic" LTI in language file

10 years agoMDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.
Chris Scribner [Fri, 11 Nov 2011 18:31:09 +0000 (13:31 -0500)]
MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.

10 years agoMerge branch 'MDL-30057' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 14:47:33 +0000 (15:47 +0100)]
Merge branch 'MDL-30057' of git://github.com/stronk7/moodle

10 years agoAdded Moodle 1.9 -> Moodle 2 converter
Darko Miletic [Tue, 13 Sep 2011 16:02:17 +0000 (13:02 -0300)]
Added Moodle 1.9 -> Moodle 2 converter

10 years agoMDL-29108 Orphaned areas are excluded from search results
David Mudrak [Fri, 11 Nov 2011 13:16:17 +0000 (14:16 +0100)]
MDL-29108 Orphaned areas are excluded from search results

If for any reason the referenced context does not exist any more, the
forms defined in relevant areas are considered removed (even if their
records still exist in the database).

10 years agoMDL-29483 The capability to manage grading forms can be overridden at the Assignment...
David Mudrak [Fri, 11 Nov 2011 12:59:04 +0000 (13:59 +0100)]
MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level

10 years agoMDL-29108 Do not display grading method selector for non-privileged users
David Mudrak [Fri, 11 Nov 2011 12:58:45 +0000 (13:58 +0100)]
MDL-29108 Do not display grading method selector for non-privileged users

The patch checks the required capability before it displays the grading
method selectors in the modform.

10 years agoMerge branch 'MDL-29945' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 11:54:11 +0000 (12:54 +0100)]
Merge branch 'MDL-29945' of git://github.com/timhunt/moodle

10 years agoMDL-29945 incorrect logic when testing if a qtype can be uninstalled.
Tim Hunt [Fri, 11 Nov 2011 11:40:07 +0000 (11:40 +0000)]
MDL-29945 incorrect logic when testing if a qtype can be uninstalled.

Thanks to Andrew Davis for catching this during testing.

10 years agoMDL-29108 Improving get_grading_method() documentation
David Mudrak [Fri, 11 Nov 2011 11:18:02 +0000 (12:18 +0100)]
MDL-29108 Improving get_grading_method() documentation

As a response to Sam's review (10)

10 years agoMDL-29108 Fixing a typo
David Mudrak [Fri, 11 Nov 2011 11:17:01 +0000 (12:17 +0100)]
MDL-29108 Fixing a typo

Spotted by Sam during the review (23)

10 years agoMDL-29108 Removing global variables where they are not needed
David Mudrak [Fri, 11 Nov 2011 11:10:02 +0000 (12:10 +0100)]
MDL-29108 Removing global variables where they are not needed

Spotted by Sam during the review (17.1 and 17.3)

10 years agoMDL-27622 theme_mymobile: quick regression fix of var
Sam Hemelryk [Fri, 11 Nov 2011 05:36:10 +0000 (18:36 +1300)]
MDL-27622 theme_mymobile: quick regression fix of  var

10 years agoMerge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Fri, 11 Nov 2011 05:35:13 +0000 (18:35 +1300)]
Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

10 years agoMDL-27037 wiki : fixed whitespace.
Aparup Banerjee [Fri, 11 Nov 2011 05:27:27 +0000 (13:27 +0800)]
MDL-27037 wiki : fixed whitespace.

10 years agoMDL-27037, wiki does not support visiblegroups functionality
Mayank Gupta [Fri, 8 Apr 2011 18:10:36 +0000 (23:40 +0530)]
MDL-27037, wiki does not support visiblegroups functionality

10 years agoMerge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Fri, 11 Nov 2011 03:26:22 +0000 (11:26 +0800)]
Merge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle

10 years agoMerge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 02:37:55 +0000 (03:37 +0100)]
Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/db/upgrade.php
report/completion/index.php
report/progress/index.php
version.php

10 years agoMerge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 01:42:40 +0000 (02:42 +0100)]
Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-22351' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 01:31:21 +0000 (02:31 +0100)]
Merge branch 'MDL-22351' of git://github.com/lazydaisy/moodle

Conflicts:
theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)

10 years agoMDL-29529 Assignment: Fix regression caused by MDL-27638
Stephen Bourget [Thu, 10 Nov 2011 22:08:43 +0000 (17:08 -0500)]
MDL-29529 Assignment: Fix regression caused by MDL-27638

10 years agoMerge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 23:20:13 +0000 (00:20 +0100)]
Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle

Conflicts:
theme/canvas/style/course.css