moodle.git
9 years agoMerge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 5 Jun 2012 02:10:21 +0000 (10:10 +0800)]
Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle

9 years agoMDL-31460 mod_forum: fix trailing whitespace
Dan Poltawski [Tue, 5 Jun 2012 01:34:26 +0000 (09:34 +0800)]
MDL-31460 mod_forum: fix trailing whitespace

9 years agoMerge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 5 Jun 2012 01:33:38 +0000 (09:33 +0800)]
Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle

9 years agoMDL-33479 removed legacy constructor causing strict notice in php5
Marina Glancy [Thu, 24 May 2012 01:39:06 +0000 (09:39 +0800)]
MDL-33479 removed legacy constructor causing strict notice in php5

9 years agoMDL-31803 lang - make the mooch registration message more descriptive
Helen Foster [Tue, 5 Jun 2012 01:08:06 +0000 (09:08 +0800)]
MDL-31803 lang - make the mooch registration message more descriptive

9 years agoMerge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:22:33 +0000 (02:22 +0200)]
Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle

9 years agoMDL-32985 cron: prevent notices on "new" sites.
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:14:13 +0000 (02:14 +0200)]
MDL-32985 cron: prevent notices on "new" sites.

9 years agoMerge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:02:12 +0000 (02:02 +0200)]
Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle

9 years agoMerge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 22:42:59 +0000 (00:42 +0200)]
Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 22:38:04 +0000 (00:38 +0200)]
Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)]
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 17:55:21 +0000 (19:55 +0200)]
Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle

9 years agoMerge branch 'MD-31803' of git://github.com/mouneyrac/moodle
Dan Poltawski [Mon, 4 Jun 2012 11:22:06 +0000 (19:22 +0800)]
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle

Conflicts:
admin/index.php
admin/renderer.php
version.php

9 years agoMerge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 09:33:47 +0000 (11:33 +0200)]
Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Mon, 4 Jun 2012 09:13:35 +0000 (17:13 +0800)]
Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle

9 years agoMerge branch 'MDL-33480' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 4 Jun 2012 08:59:49 +0000 (16:59 +0800)]
Merge branch 'MDL-33480' of git://github.com/stronk7/moodle

9 years agoMDL-33007 fix incorrect min_fix_utf8() tests
Petr Skoda [Mon, 4 Jun 2012 08:45:13 +0000 (10:45 +0200)]
MDL-33007 fix incorrect min_fix_utf8() tests

Credit goest to Eloy Lafuente.

9 years agoMDL-29173 - fix whitespace error
Dan Poltawski [Mon, 4 Jun 2012 08:32:25 +0000 (16:32 +0800)]
MDL-29173 - fix whitespace error

9 years agoMerge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 4 Jun 2012 07:55:54 +0000 (15:55 +0800)]
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle

9 years agoMDL-33507 - oauth2lib: switch 'code' to oauth2code
Dan Poltawski [Mon, 4 Jun 2012 03:25:19 +0000 (11:25 +0800)]
MDL-33507 - oauth2lib: switch 'code' to oauth2code

To avoid param collisions in future.

9 years agoMDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php
Dan Poltawski [Mon, 4 Jun 2012 03:11:38 +0000 (11:11 +0800)]
MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php

The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.

9 years agoMDL-33501 - oauth2lib: improve redirect url handling
Dan Poltawski [Mon, 4 Jun 2012 02:51:21 +0000 (10:51 +0800)]
MDL-33501 - oauth2lib: improve redirect url handling

Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.

9 years agoMDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent...
Andrew Davis [Fri, 11 May 2012 03:33:17 +0000 (10:33 +0700)]
MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete

9 years agoMDL-32649 rating: fixed the sorting in /rating/index.php
Andrew Davis [Mon, 21 May 2012 01:08:58 +0000 (08:08 +0700)]
MDL-32649 rating: fixed the sorting in /rating/index.php

9 years agoMDL-33480 book print tool: display intro images properly
Eloy Lafuente (stronk7) [Sun, 3 Jun 2012 23:46:53 +0000 (01:46 +0200)]
MDL-33480 book print tool: display intro images properly

9 years agoMDL-33436 include phpunit printer file from our lib.php
Petr Skoda [Sat, 2 Jun 2012 19:48:26 +0000 (21:48 +0200)]
MDL-33436 include phpunit printer file from our lib.php

The problem is that the phpunit.xml does not support relative links.

9 years agoMDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing...
sam marshall [Thu, 24 May 2012 13:22:33 +0000 (14:22 +0100)]
MDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing wheel

9 years agoMDL-33007 add workaround for broken iconv //IGNORE
Petr Skoda [Tue, 15 May 2012 21:07:10 +0000 (23:07 +0200)]
MDL-33007 add workaround for broken iconv //IGNORE

This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.

9 years agoMDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues
Petr Skoda [Tue, 15 May 2012 21:04:46 +0000 (23:04 +0200)]
MDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues

9 years agoon-demand release 2.3dev
Dan Poltawski [Fri, 1 Jun 2012 09:03:32 +0000 (17:03 +0800)]
on-demand release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Fri, 1 Jun 2012 09:01:41 +0000 (17:01 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Fri, 1 Jun 2012 01:42:01 +0000 (13:42 +1200)]
Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33326' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)]
Merge branch 'MDL-33326' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-33389_master' of git://github.com/kordan/moodle
Eloy Lafuente (stronk7) [Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)]
Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'MDL-33434' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 31 May 2012 08:59:23 +0000 (16:59 +0800)]
Merge branch 'MDL-33434' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Thu, 31 May 2012 07:11:25 +0000 (15:11 +0800)]
Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-33140' of git://github.com/timhunt/moodle
Aparup Banerjee [Thu, 31 May 2012 06:15:19 +0000 (14:15 +0800)]
Merge branch 'MDL-33140' of git://github.com/timhunt/moodle

9 years agoMDL-33398 Cron: fix wrong variable type in completion criterias
Frederic Massart [Thu, 31 May 2012 02:19:15 +0000 (10:19 +0800)]
MDL-33398 Cron: fix wrong variable type in completion criterias

9 years agoMerge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle
Dan Poltawski [Thu, 31 May 2012 02:35:50 +0000 (10:35 +0800)]
Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 31 May 2012 00:31:19 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-33434 mssql: Improve handling of returned ids on insert.
Eloy Lafuente (stronk7) [Wed, 30 May 2012 23:01:14 +0000 (01:01 +0200)]
MDL-33434 mssql: Improve handling of returned ids on insert.

This commit moves from the batch SCOPE_IDENTITY() way to return
the inserted ids to the OUTPUT alternative (supported and
recommended since 2005). Also the handling of possible return
values is improved, with all the alternatives leading to expected results.

9 years agoMDL-33434 dml: define expected results when unique constraint is violated on insert.
Eloy Lafuente (stronk7) [Wed, 30 May 2012 22:58:19 +0000 (00:58 +0200)]
MDL-33434 dml: define expected results when unique constraint is violated on insert.

9 years agoMDL-33140 quiz browser security: block copy/paste more
Tim Hunt [Wed, 30 May 2012 20:48:39 +0000 (14:48 -0600)]
MDL-33140 quiz browser security: block copy/paste more

9 years agoMDL-29857 google apis: OAuth 2.0 portfolio plugins upgrade
Dan Poltawski [Tue, 29 May 2012 06:35:25 +0000 (14:35 +0800)]
MDL-29857 google apis: OAuth 2.0 portfolio plugins upgrade

We are disabling the plugins if not configured. As part of
this upgrade we will emailing admins about this change
if they have a plugin configured.

This is required because OAuth 2 credentials are now required
in the plugin configuration.

NOTE: These strings are temporary and need to be improved.

9 years agoMDL-29857 google apis: OAuth 2.0 repository plugins upgrade
Dan Poltawski [Wed, 30 May 2012 15:56:07 +0000 (23:56 +0800)]
MDL-29857 google apis: OAuth 2.0 repository plugins upgrade

We are disabling the plugins on upgrade and emailing admins
about this if they have a plugin configured.

This is required because OAuth 2 credentials are now required
in the plugin configuration.

NOTE: These strings are temporary and need to be improved.

9 years agoMDL-29857 - google apis: Convert to OAuth 2.0
Dan Poltawski [Sun, 13 May 2012 16:42:24 +0000 (00:42 +0800)]
MDL-29857 - google apis: Convert to OAuth 2.0

Updated the various plugins to use OAuth 2.0 for authentication
against google apis. Google are phasing out AuthSub and pushing OAuth as
the replacement.

This changes repository_googledocs, repository_picasa,
portfolio_googledocs and portfolio_picasa

The token for requests is now stored in session rather than a user
prefence and it persists less but doesn't bother the user more than
necessary.

The google docs portfolio plugin is converted to use resumable upload
API as this appears to be what Google have replaced this with.

Unfortunately unlike authsub OAuth will require some setup by admins,
this is linked as a docs page.

9 years agoMDL-29857 - lib: Add an OAuth 2.0 client
Dan Poltawski [Sun, 13 May 2012 16:39:00 +0000 (00:39 +0800)]
MDL-29857 - lib: Add an OAuth 2.0 client

A generic OAuth 2.0 for the web application flow, tested against
microsoft and google apis.

Added a callback endpoint for requests so that clients can use a single
endpoint (without GET params). I put this in /admin/ as I expect some
sites will have .htaccess denying access to /lib/.

9 years agoMerge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Wed, 30 May 2012 08:48:23 +0000 (16:48 +0800)]
Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32329 fixed missing phpdoc and improved coding style
David Mudrak [Wed, 30 May 2012 08:32:48 +0000 (10:32 +0200)]
MDL-32329 fixed missing phpdoc and improved coding style

Credit goes to Aparup Banerjee for spotting this during the integration
review.

9 years agoMDL-32329 improved plugin dependencies check on upgrade
David Mudrak [Fri, 25 May 2012 09:17:43 +0000 (11:17 +0200)]
MDL-32329 improved plugin dependencies check on upgrade

Previously, it was the renderer method that actually called
all_plugins_ok(). I believe that renderer methods should not be
responsible for such an important step in the install/upgrade code flow.
So dependencies are now checked by admin/index.php on upgrade, too.

9 years agoMDL-32329 check for plugin dependencies during the pre-install checking
David Mudrak [Fri, 25 May 2012 08:44:29 +0000 (10:44 +0200)]
MDL-32329 check for plugin dependencies during the pre-install checking

This follows the same path as we have in CLI installers. Plugin
dependencies are checked right after the environment checks and the
install can't continue unless all dependencies are fixed.

9 years agoMDL-32329 new plugininfo_base::is_core_dependency_satisfied() method
David Mudrak [Fri, 25 May 2012 08:38:48 +0000 (10:38 +0200)]
MDL-32329 new plugininfo_base::is_core_dependency_satisfied() method

The method's logic was previously implemented in all_plugins_ok() but we
will need to call it separately. Also make the code cleaner.

9 years agoMDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies
David Mudrak [Thu, 24 May 2012 12:31:13 +0000 (14:31 +0200)]
MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies

9 years agoMDL-32329 plugin manager returns plugins with unsatisfied dependencies
David Mudrak [Thu, 24 May 2012 12:30:04 +0000 (14:30 +0200)]
MDL-32329 plugin manager returns plugins with unsatisfied dependencies

9 years agoMerge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle
Aparup Banerjee [Wed, 30 May 2012 07:18:59 +0000 (15:18 +0800)]
Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle

9 years agoMerge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 30 May 2012 06:22:34 +0000 (14:22 +0800)]
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)]
Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle

9 years agoMDL-33218 Filepicker repository and toolbar aligned for IE
Barbara Ramiro [Wed, 30 May 2012 05:56:34 +0000 (13:56 +0800)]
MDL-33218 Filepicker repository and toolbar aligned for IE

9 years agoRevert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"
Sam Hemelryk [Wed, 30 May 2012 04:34:11 +0000 (16:34 +1200)]
Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"

This reverts commit a09a9be81210a29a0c093ff34dc5685c86b84022, reversing
changes made to 08e0aaa1733489cee61b1c48e166a98ada4477cb.

9 years agoMerge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 30 May 2012 03:45:32 +0000 (11:45 +0800)]
Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-32766 course view section log: fixed the forth param for restore rule specificati...
Rossiani Wijaya [Tue, 29 May 2012 06:19:35 +0000 (14:19 +0800)]
MDL-32766 course view section log: fixed the forth param for restore rule specification to use course_section

9 years agoMerge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle
Dan Poltawski [Wed, 30 May 2012 03:35:56 +0000 (11:35 +0800)]
Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle

9 years agoMerge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Wed, 30 May 2012 03:26:27 +0000 (15:26 +1200)]
Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 30 May 2012 03:03:11 +0000 (11:03 +0800)]
Merge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-33373 fixed bug in backup of files as a regression from MDL-28666
Marina Glancy [Wed, 30 May 2012 02:11:41 +0000 (10:11 +0800)]
MDL-33373 fixed bug in backup of files as a regression from MDL-28666

9 years agoMDL-33184 Filepicker: rephrased drag and drop sentence
Frederic Massart [Wed, 30 May 2012 02:05:10 +0000 (10:05 +0800)]
MDL-33184 Filepicker: rephrased drag and drop sentence

9 years agoMerge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle
Dan Poltawski [Wed, 30 May 2012 01:38:22 +0000 (09:38 +0800)]
Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle

9 years agoMDL-33398 completion: Fix coding error (should be arrays not objects)
Aaron Barnes [Tue, 29 May 2012 02:34:16 +0000 (14:34 +1200)]
MDL-33398 completion: Fix coding error (should be arrays not objects)

9 years agoMDL-33385: Assignment plugin settings not visible in admin tree.
Damyon Wiese [Wed, 30 May 2012 01:01:11 +0000 (09:01 +0800)]
MDL-33385: Assignment plugin settings not visible in admin tree.

* Also fixes a regression where file_submissions were not set to default for new installs.

9 years agoMDL-33414: The setting $showviewlink needs to be passed by reference
Damyon Wiese [Wed, 30 May 2012 00:37:56 +0000 (08:37 +0800)]
MDL-33414: The setting $showviewlink needs to be passed by reference

This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 30 May 2012 00:31:17 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-33326 filestorage tests: Coding style fixes
Eloy Lafuente (stronk7) [Tue, 29 May 2012 22:20:54 +0000 (00:20 +0200)]
MDL-33326 filestorage tests: Coding style fixes

9 years agoMDL-33326 filestorage tests: Add more coverage
Dan Poltawski [Mon, 28 May 2012 03:29:44 +0000 (11:29 +0800)]
MDL-33326 filestorage tests: Add more coverage

9 years agoMDL-33326 filestorage tests: Actually verify results
Dan Poltawski [Mon, 28 May 2012 03:28:46 +0000 (11:28 +0800)]
MDL-33326 filestorage tests: Actually verify results

Rather than the placeholder tests which were added before to trigger
DB incompatibilities

9 years agoMDL-3389 mod_book: changed "Summary" to "Description" in mod_form
kordan [Tue, 29 May 2012 17:23:33 +0000 (19:23 +0200)]
MDL-3389 mod_book: changed "Summary" to "Description" in mod_form

9 years agoMDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php
Andrew Davis [Sun, 20 May 2012 04:17:44 +0000 (11:17 +0700)]
MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php

9 years agoMerge branch 'MDL-32779' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 29 May 2012 09:11:11 +0000 (17:11 +0800)]
Merge branch 'MDL-32779' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33375' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 29 May 2012 09:06:19 +0000 (17:06 +0800)]
Merge branch 'MDL-33375' of git://github.com/danpoltawski/moodle

9 years agoMDL-32779 course/format: Return to correct section
Dan Poltawski [Tue, 29 May 2012 08:54:04 +0000 (16:54 +0800)]
MDL-32779 course/format: Return to correct section

When editing a single section mode item

9 years agoMerge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Tue, 29 May 2012 08:43:39 +0000 (16:43 +0800)]
Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 29 May 2012 08:31:26 +0000 (16:31 +0800)]
Merge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle

9 years agoMDL-27120 backup: fixed docblock and code cleanup
Rajesh Taneja [Tue, 17 Apr 2012 03:32:15 +0000 (11:32 +0800)]
MDL-27120 backup: fixed docblock and code cleanup

9 years agoMerge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 29 May 2012 08:20:21 +0000 (16:20 +0800)]
Merge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 May 2012 08:10:59 +0000 (16:10 +0800)]
Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 29 May 2012 07:56:28 +0000 (15:56 +0800)]
Merge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 May 2012 07:40:36 +0000 (15:40 +0800)]
Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 29 May 2012 07:21:55 +0000 (15:21 +0800)]
Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle

Conflicts:
course/format/weeks/format.js
course/format/weeks/lib.php

9 years agoMerge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 29 May 2012 07:12:38 +0000 (15:12 +0800)]
Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 29 May 2012 07:08:46 +0000 (15:08 +0800)]
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 29 May 2012 07:00:21 +0000 (15:00 +0800)]
Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle

9 years agoMDL-33397 Filepicker: cancel button always present in private files
Frederic Massart [Tue, 29 May 2012 07:00:19 +0000 (15:00 +0800)]
MDL-33397 Filepicker: cancel button always present in private files

9 years agoMerge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 May 2012 06:58:31 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 29 May 2012 06:57:05 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-27120: Cache DB operations in restore_dbops
Tony Levi [Sat, 16 Apr 2011 04:03:33 +0000 (13:33 +0930)]
MDL-27120: Cache DB operations in restore_dbops

9 years agoMDL-27120: Cache dirname transformations in progressive_parser::dirname
Tony Levi [Mon, 11 Apr 2011 06:04:02 +0000 (15:34 +0930)]
MDL-27120: Cache dirname transformations in progressive_parser::dirname

9 years agomdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()
Adam Olley [Wed, 14 Sep 2011 02:12:03 +0000 (11:42 +0930)]
mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()

9 years agomdl-27120 Fixed incorrect variable in parameter when adding form dependencies.
Jason Ilicic [Tue, 22 Nov 2011 00:04:56 +0000 (10:34 +1030)]
mdl-27120 Fixed incorrect variable in parameter when adding form dependencies.

9 years agoMDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()
Ashley Holman [Thu, 7 Apr 2011 09:06:43 +0000 (18:36 +0930)]
MDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()

9 years agoMDL-27120 More efficient use of QuickForms in backup UI
Ashley Holman [Thu, 7 Apr 2011 06:08:10 +0000 (15:38 +0930)]
MDL-27120 More efficient use of QuickForms in backup UI

9 years agoMDL-27120 backup: replace sequential scan search with hash-based lookup.
Ashley Holman [Thu, 7 Apr 2011 04:46:07 +0000 (14:16 +0930)]
MDL-27120 backup: replace sequential scan search with hash-based lookup.