moodle.git
9 years agoMerge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Fri, 27 Apr 2012 01:15:51 +0000 (03:15 +0200)]
Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle

9 years agoMDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display
Andrew Robert Nicols [Thu, 26 Apr 2012 10:02:39 +0000 (11:02 +0100)]
MDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display

9 years agoMDL-31096 Add hiding of activity descriptions
Andrew Robert Nicols [Thu, 26 Apr 2012 09:39:47 +0000 (10:39 +0100)]
MDL-31096 Add hiding of activity descriptions

9 years agoRevert MDL-31215 Add the ability to change activity titles using AJAX calls
Andrew Robert Nicols [Thu, 26 Apr 2012 08:56:41 +0000 (09:56 +0100)]
Revert MDL-31215 Add the ability to change activity titles using AJAX calls

This *partially* reverts commit 6a14c4ffdd01d6b2069e8c27bb2b7df26dcdbd6a.

Note however parts of that commit were unrelated and haven't been
reverted.

9 years agoMDL-26014 - blog - improving the label for the URL of an external blog feed
Jason Fowler [Mon, 16 Apr 2012 02:07:44 +0000 (10:07 +0800)]
MDL-26014 - blog - improving the label for the URL of an external blog feed

9 years agoMDL-31263 lib/ajax/blocks.php fix nonsensical url
Dan Poltawski [Thu, 26 Apr 2012 03:03:05 +0000 (11:03 +0800)]
MDL-31263 lib/ajax/blocks.php fix nonsensical url

9 years agoMerge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 01:32:08 +0000 (03:32 +0200)]
Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-19263-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 00:46:21 +0000 (02:46 +0200)]
Merge branch 'MDL-19263-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 26 Apr 2012 00:17:00 +0000 (02:17 +0200)]
Merge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32630 workshop_calendar_update() does not check for calendar permissions
David Mudrak [Wed, 25 Apr 2012 13:35:59 +0000 (15:35 +0200)]
MDL-32630 workshop_calendar_update() does not check for calendar permissions

As discussed in MDL-32631, calendar_event::update() should not do
capability checks at all. Until that issue is fixed, we just explicitly
declare that no capability checks should be done.

The function workshop_calendar_update() is executed when adding or
updating a workshop instance (where permissions to modify the instance
were already checked and are sufficient) and in the upgrade code (where
no check should be performed anyway).

9 years agoMerge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 13:14:27 +0000 (15:14 +0200)]
Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32471 fixed strict standards in the declaration of send_file() in assignment...
David Mudrak [Wed, 25 Apr 2012 11:48:12 +0000 (13:48 +0200)]
MDL-32471 fixed strict standards in the declaration of send_file() in assignment types

All subtypes declaration should be compatible with that of assignment_base::send_file()

9 years agoMDL-32471 improved SQL to prevent potential full table scans
David Mudrak [Wed, 25 Apr 2012 11:44:36 +0000 (13:44 +0200)]
MDL-32471 improved SQL to prevent potential full table scans

9 years agoMerge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 11:07:48 +0000 (13:07 +0200)]
Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle

9 years agoMDL-32471 just a trivial change to prevent eventual issues with various preview modes
David Mudrak [Wed, 25 Apr 2012 09:53:57 +0000 (11:53 +0200)]
MDL-32471 just a trivial change to prevent eventual issues with various preview modes

9 years agoMDL-32471 adding preview generation unit tests
David Mudrak [Wed, 25 Apr 2012 09:25:56 +0000 (11:25 +0200)]
MDL-32471 adding preview generation unit tests

The test image is a public domain file from
http://commons.wikimedia.org/wiki/File:Easter_eggs_-_onion_decoration.jpg

9 years agoMerge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:40:53 +0000 (03:40 +0200)]
Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:20:23 +0000 (03:20 +0200)]
Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle

9 years agoMDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones.
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:09:42 +0000 (03:09 +0200)]
MDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones.

9 years agoMerge branch 'MDL-32322' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 01:02:14 +0000 (03:02 +0200)]
Merge branch 'MDL-32322' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/report/simpletest/testreportlib.php
mod/quiz/report/statistics/simpletest/test_qstats.php

9 years agoMDL-32490 Offline assignment: phpdocs and whitespace fixes
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:40:35 +0000 (02:40 +0200)]
MDL-32490 Offline assignment: phpdocs and whitespace fixes

9 years agoMerge branch 'MDL-32490' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:28:50 +0000 (02:28 +0200)]
Merge branch 'MDL-32490' of git://github.com/bostelm/moodle

9 years agoMerge branch 'MDL-32566_master' of git://github.com/kordan/moodle
Eloy Lafuente (stronk7) [Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)]
Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 23:55:24 +0000 (01:55 +0200)]
Merge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 23:11:38 +0000 (01:11 +0200)]
Merge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 19:56:57 +0000 (21:56 +0200)]
Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-32471 using === for string comparison
David Mudrak [Tue, 24 Apr 2012 14:10:46 +0000 (16:10 +0200)]
MDL-32471 using === for string comparison

Thanks to Petr Skoda for spotting this during the peer-review.

9 years agoMDL-32471 remove orphaned preview files via cron
David Mudrak [Tue, 24 Apr 2012 13:14:09 +0000 (15:14 +0200)]
MDL-32471 remove orphaned preview files via cron

9 years agoMDL-32471 preview thumbnails support for other component types
David Mudrak [Tue, 24 Apr 2012 12:29:44 +0000 (14:29 +0200)]
MDL-32471 preview thumbnails support for other component types

This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.

9 years agoMDL-32471 preview thumbnails support for blocks
David Mudrak [Tue, 24 Apr 2012 12:01:53 +0000 (14:01 +0200)]
MDL-32471 preview thumbnails support for blocks

block_xxx_pluginfile() now accepts the $options parameter that is to be passed
to the send_stored_file() function.

9 years agoMDL-31914 db fix - cannot use table aliases on DELETE statements. Credit goes to...
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 11:07:11 +0000 (13:07 +0200)]
MDL-31914 db fix - cannot use table aliases on DELETE statements. Credit goes to Andrew Nicols (LUNS).

9 years agoMerge branch 'MDL-32249' of github.com:srynot4sale/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 10:56:30 +0000 (12:56 +0200)]
Merge branch 'MDL-32249' of github.com:srynot4sale/moodle

9 years agoMDL-31914 Ensure that completion criteria are deleted when removing a course module
Andrew Robert Nicols [Tue, 6 Mar 2012 14:06:04 +0000 (14:06 +0000)]
MDL-31914 Ensure that completion criteria are deleted when removing a course module

Conflicts:

lib/db/upgrade.php
version.php

9 years agoMDL-32471 preview thumbnails support for activity modules
David Mudrak [Wed, 18 Apr 2012 13:56:09 +0000 (15:56 +0200)]
MDL-32471 preview thumbnails support for activity modules

Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.

9 years agoMDL-32471 send_stored_file() now supports the preview option
David Mudrak [Tue, 17 Apr 2012 22:43:16 +0000 (00:43 +0200)]
MDL-32471 send_stored_file() now supports the preview option

If for any reason the preview image can't be generated for the given
file (eg we do not support its mimetype yet), the function will send
404 Not Found HTTP header. This will be useful for the lazy loading of
the file thumbnails as the JavaScript will simply ignore such response
and will not replace the default icon for the file.

In the future, a fallback thumbnail generator can be implemented that
would generate some sort of default preview for all files (eg using
the mimetype icon like some desktop OS do).

9 years agoMDL-32471 introducing file_storage::get_file_preview() method
David Mudrak [Tue, 17 Apr 2012 22:41:01 +0000 (00:41 +0200)]
MDL-32471 introducing file_storage::get_file_preview() method

9 years agoMDL-32471 introducing generate_image_thumbnail() function
David Mudrak [Tue, 17 Apr 2012 22:37:49 +0000 (00:37 +0200)]
MDL-32471 introducing generate_image_thumbnail() function

This helper function uses GD library to generate a thumbnail of the
given image file.

9 years agoMDL-32471 fixing the coding style in lib/gdlib.php
David Mudrak [Tue, 17 Apr 2012 22:32:07 +0000 (00:32 +0200)]
MDL-32471 fixing the coding style in lib/gdlib.php

The GD functions are listed in lowercase in the PHP manual. So they
should be using this case in our code, too (otherwise, doc autolinking
tools may not work). I did not remove the underscore from the parameters
names intentionally to have the function interface compatible with the
one documented in the PHP manual.

See http://www.php.net/manual/en/ref.image.php
<

9 years agoMDL-32471 changing the interface of the send_stored_file()
David Mudrak [Tue, 17 Apr 2012 13:05:33 +0000 (15:05 +0200)]
MDL-32471 changing the interface of the send_stored_file()

9 years agoMDL-32471 pluginfile.php accepts optional parameter 'preview'
David Mudrak [Tue, 17 Apr 2012 12:56:14 +0000 (14:56 +0200)]
MDL-32471 pluginfile.php accepts optional parameter 'preview'

9 years agoMerge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 24 Apr 2012 08:37:13 +0000 (10:37 +0200)]
Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle

9 years agoMDL-32574 fi sqlsrv adodb test
Petr Skoda [Tue, 24 Apr 2012 07:22:26 +0000 (09:22 +0200)]
MDL-32574 fi sqlsrv adodb test

9 years agoMerge branch 'master_MDL-32102' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 24 Apr 2012 07:17:43 +0000 (15:17 +0800)]
Merge branch 'master_MDL-32102' of git://github.com/danmarsden/moodle

9 years agoMDL-31720 Refactor course/rest.php
Ruslan Kabalin [Mon, 20 Feb 2012 17:09:27 +0000 (17:09 +0000)]
MDL-31720 Refactor course/rest.php

This removes duplicates and block actions remains. It also makes it
possible to include course/rest.php in such a way that it could be extended
by non-core modules wishing to overide parts of its functionality (e.g.
mod_subpage)

9 years agoMDL-31215 Add the ability to change activity titles using AJAX calls
Andrew Robert Nicols [Thu, 5 Jan 2012 16:53:02 +0000 (16:53 +0000)]
MDL-31215 Add the ability to change activity titles using AJAX calls

9 years agoMDL-31263 Rewrite block drag/drop using YUI3
Ruslan Kabalin [Fri, 20 Apr 2012 14:55:40 +0000 (15:55 +0100)]
MDL-31263 Rewrite block drag/drop using YUI3

9 years agoMerge branch 'wip-MDL-31928-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 24 Apr 2012 02:32:18 +0000 (10:32 +0800)]
Merge branch 'wip-MDL-31928-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'w17_MDL-32427_m23_protocols' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Apr 2012 02:27:15 +0000 (10:27 +0800)]
Merge branch 'w17_MDL-32427_m23_protocols' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Apr 2012 02:23:14 +0000 (10:23 +0800)]
Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 23:47:14 +0000 (01:47 +0200)]
Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 23:42:28 +0000 (01:42 +0200)]
Merge branch 'MDL-32514-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-19549' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 23:00:16 +0000 (01:00 +0200)]
Merge branch 'MDL-19549' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-28176' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 22:30:50 +0000 (00:30 +0200)]
Merge branch 'MDL-28176' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-32134' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 22:07:23 +0000 (00:07 +0200)]
Merge branch 'MDL-32134' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 22:03:36 +0000 (00:03 +0200)]
Merge branch 'wip-MDL-26500' of git://github.com/danpoltawski/moodle

9 years agoMDL-31216 Create dragdrop course module
Ruslan Kabalin [Wed, 18 Jan 2012 10:53:23 +0000 (10:53 +0000)]
MDL-31216 Create dragdrop course module

9 years agoMDL-31222 Create a core YUI3 Module for drag-drop
Ruslan Kabalin [Wed, 18 Jan 2012 10:55:59 +0000 (10:55 +0000)]
MDL-31222 Create a core YUI3 Module for drag-drop

9 years agoMDL-31096 Convert course resource/section javascript to YUI3 Module
Andrew Robert Nicols [Thu, 5 Jan 2012 16:53:02 +0000 (16:53 +0000)]
MDL-31096 Convert course resource/section javascript to YUI3 Module

AMOS BEGIN
  MOV [hideweekfromothers,moodle],[hidefromothers,format_week]
  MOV [showweekfromothers,moodle],[showfromothers,format_week]
  MOV [hidetopicfromothers,moodle],[hidefromothers,format_topics]
  MOV [showtopicfromothers,moodle],[showfromothers,format_topics]
AMOS END

9 years agoMDL-31096 Create generic coursemodule javascript library
Andrew Robert Nicols [Wed, 18 Apr 2012 15:10:19 +0000 (16:10 +0100)]
MDL-31096 Create generic coursemodule javascript library

This library handles registration and invocation of calls for other
libraries. It allows us to register javascript modules containing functions
which may called dynamically later on, for example when adding a resource
or section dynamically

9 years agoMDL-31052 Add generic lightbox spinner to indicate progress to user
Ruslan Kabalin [Mon, 23 Apr 2012 13:45:44 +0000 (14:45 +0100)]
MDL-31052  Add generic lightbox spinner to indicate progress to user

9 years agoMDL-25407 ignore errors in CLI mysql engine conversion script
Petr Skoda [Mon, 23 Apr 2012 17:19:19 +0000 (19:19 +0200)]
MDL-25407 ignore errors in CLI mysql engine conversion script

9 years agoMDL-32566 theme_formal_white: restyling of login block
kordan [Mon, 23 Apr 2012 13:13:13 +0000 (15:13 +0200)]
MDL-32566 theme_formal_white: restyling of login block

9 years agoMDL-29262 phpunit: fix forgotten mock objects to avoid strict notices
Eloy Lafuente (stronk7) [Mon, 23 Apr 2012 12:57:07 +0000 (14:57 +0200)]
MDL-29262 phpunit: fix forgotten mock objects to avoid strict notices

9 years agoMerge branch 'w17_MDL-32477_m23_cloneperm' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 08:35:26 +0000 (16:35 +0800)]
Merge branch 'w17_MDL-32477_m23_cloneperm' of git://github.com/skodak/moodle

9 years agoMDL-32427 add HTML Purifier allowed scheme tests
Petr Skoda [Thu, 19 Apr 2012 07:56:37 +0000 (09:56 +0200)]
MDL-32427 add HTML Purifier allowed scheme tests

9 years agoMDL-32427 fix suport for extra schemes in links in HTML Purifier
Petr Skoda [Mon, 23 Apr 2012 08:24:46 +0000 (10:24 +0200)]
MDL-32427 fix suport for extra schemes in links in HTML Purifier

9 years agoMerge branch 'w17_MDL-32449_m23_tinymce' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 07:37:34 +0000 (15:37 +0800)]
Merge branch 'w17_MDL-32449_m23_tinymce' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-31553_m23_clitimeout' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 07:25:42 +0000 (15:25 +0800)]
Merge branch 'w17_MDL-31553_m23_clitimeout' of git://github.com/skodak/moodle

9 years agoMDL-32578 theme_formal_white: modified two lang strings
kordan [Sun, 22 Apr 2012 16:20:27 +0000 (18:20 +0200)]
MDL-32578 theme_formal_white: modified two lang strings

9 years agoMerge branch 'wip-MDL-32497-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 23 Apr 2012 06:25:59 +0000 (14:25 +0800)]
Merge branch 'wip-MDL-32497-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle
Dan Poltawski [Mon, 23 Apr 2012 05:55:00 +0000 (13:55 +0800)]
Merge branch 'wip_mdl-31540-master' of https://github.com/iarenaza/moodle

Conflicts:
auth/ldap/auth.php

9 years agoMerge branch 'MDL-32462' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 23 Apr 2012 04:54:01 +0000 (12:54 +0800)]
Merge branch 'MDL-32462' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32104-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 23 Apr 2012 04:49:56 +0000 (12:49 +0800)]
Merge branch 'MDL-32104-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-29262' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 23 Apr 2012 04:42:16 +0000 (12:42 +0800)]
Merge branch 'MDL-29262' of git://github.com/stronk7/moodle

Conflicts:
version.php

9 years agoMerge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 04:24:39 +0000 (12:24 +0800)]
Merge branch 'w17_MDL-25407_m23_innodb' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 23 Apr 2012 04:20:57 +0000 (12:20 +0800)]
Merge branch 'MDL-32215-master' of git://github.com/sammarshallou/moodle

Conflicts:
course/simpletest/testcourselib.php
    lib/db/upgrade.php
version.php

9 years agoMerge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 03:47:11 +0000 (11:47 +0800)]
Merge branch 'w17_MDL-31607_m23_login' of git://github.com/skodak/moodle

9 years agoMDL-31431 webservices: improve user pic docs
Jerome Mouneyrac [Mon, 16 Apr 2012 03:27:10 +0000 (11:27 +0800)]
MDL-31431 webservices: improve user pic docs

Explain how to retrieve profile picture when forcelogin is set to NO and guestaccess to Yes

9 years agoMerge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 03:21:06 +0000 (11:21 +0800)]
Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle

9 years agoMerge branch 'master_MDL-29975' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:59:17 +0000 (10:59 +0800)]
Merge branch 'master_MDL-29975' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-30187-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:51:02 +0000 (10:51 +0800)]
Merge branch 'MDL-30187-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:42:42 +0000 (10:42 +0800)]
Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip_mdl-16646_master' of https://github.com/iarenaza/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:32:37 +0000 (10:32 +0800)]
Merge branch 'wip_mdl-16646_master' of https://github.com/iarenaza/moodle

9 years agoMerge branch 'MDL-23647_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:27:44 +0000 (10:27 +0800)]
Merge branch 'MDL-23647_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w17_MDL-32451_m23_wikistrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:25:54 +0000 (10:25 +0800)]
Merge branch 'w17_MDL-32451_m23_wikistrict' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-32512_m23_estrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:22:04 +0000 (10:22 +0800)]
Merge branch 'w17_MDL-32512_m23_estrict' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-32451_m23_blockstrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:16:27 +0000 (10:16 +0800)]
Merge branch 'w17_MDL-32451_m23_blockstrict' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-32576_m23_markdown' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:09:02 +0000 (10:09 +0800)]
Merge branch 'w17_MDL-32576_m23_markdown' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-32575_m23_typo3' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:07:07 +0000 (10:07 +0800)]
Merge branch 'w17_MDL-32575_m23_typo3' of git://github.com/skodak/moodle

9 years agoMerge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 23 Apr 2012 02:00:24 +0000 (10:00 +0800)]
Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle

9 years agoMDL-32492 auth/cas: respect https login links
Chris Follin [Tue, 17 Apr 2012 20:35:58 +0000 (16:35 -0400)]
MDL-32492 auth/cas: respect https login links

9 years agoMDL-32497: WebDAV repository need to return more information and work correctly with...
Marina Glancy [Wed, 18 Apr 2012 01:39:58 +0000 (09:39 +0800)]
MDL-32497: WebDAV repository need to return more information and work correctly with subdirs

9 years agoMDL-32417: Fixed pagination bug in Flickr search results, also return thumbnail sizes
Marina Glancy [Thu, 12 Apr 2012 07:03:25 +0000 (15:03 +0800)]
MDL-32417: Fixed pagination bug in Flickr search results, also return thumbnail sizes

9 years agoMDL-31928: Fixing bugs in repository_url
Marina Glancy [Thu, 8 Mar 2012 03:18:47 +0000 (11:18 +0800)]
MDL-31928: Fixing bugs in repository_url

- if the same image occurs several times on the page list it only once
- resolve image path correctly if it has a query string
- show images included in CSS
- non-JS file picker ignores thumbnail width and height attributes (this is a temp fix until renderers are implemented)

9 years agoMDL-32249 completion: Round course grades and remove hardcoded string
Aaron Barnes [Wed, 11 Apr 2012 06:54:40 +0000 (18:54 +1200)]
MDL-32249 completion: Round course grades and remove hardcoded string

9 years agoMDL-26959 - Blog - changing wording of the entry delete confirmation string to make...
Jason Fowler [Mon, 16 Apr 2012 01:58:32 +0000 (09:58 +0800)]
MDL-26959 - Blog - changing wording of the entry delete confirmation string to make it more appropriate

9 years agoMDL-32102 Course completion - only restore user completion if not adding to existing...
Dan Marsden [Sun, 22 Apr 2012 23:30:11 +0000 (11:30 +1200)]
MDL-32102 Course completion - only restore user completion if not adding to existing course

9 years agoMDL32575 make sure typo3 is not confused by non-string data types
Petr Skoda [Sun, 22 Apr 2012 22:20:47 +0000 (00:20 +0200)]
MDL32575 make sure typo3 is not confused by non-string data types

9 years agoMDL-29262 restore: Clean controller obj form DB once finished ok
Eloy Lafuente (stronk7) [Sun, 22 Apr 2012 22:14:32 +0000 (00:14 +0200)]
MDL-29262 restore: Clean controller obj form DB once finished ok

9 years agoMDL-29262 backup: Clean controller obj form DB once finished ok
Eloy Lafuente (stronk7) [Sun, 22 Apr 2012 21:30:44 +0000 (23:30 +0200)]
MDL-29262 backup: Clean controller obj form DB once finished ok