Commit graph

13128 commits

Author SHA1 Message Date
Dan Poltawski
a4c9412b15 Merge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/moodle 2012-05-01 10:19:17 +08:00
Dan Poltawski
94b9d44f28 Merge branch 'w18_MDL-32586_m23_glibciconv' of git://github.com/skodak/moodle 2012-05-01 10:00:01 +08:00
Sam Hemelryk
7c30505be8 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-01 13:43:07 +12:00
Sam Hemelryk
75c9c54be4 Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle 2012-05-01 13:41:37 +12:00
Sam Hemelryk
3a4b0d0bc0 Merge branch 'w18_MDL-32607_m23_upgrade2' of git://github.com/skodak/moodle 2012-05-01 13:34:08 +12:00
Sam Hemelryk
46847c220c Merge branch 'w18_MDL-32612_m23_debug' of git://github.com/skodak/moodle 2012-05-01 13:29:39 +12:00
Ruslan Kabalin
3f9d9e2856 MDL-32009 messaging: Add message processor uninstall functionality 2012-04-30 10:34:39 +01:00
Ruslan Kabalin
bede23f7bc MDL-32009 messaging: Add is_enabled method to plugintype_message 2012-04-30 10:34:37 +01:00
Ruslan Kabalin
bc795b98e9 MDL-32009 messaging: Refator get_settings_url plugintype method
No need to duplicate checks since we have them in one place.
2012-04-30 10:34:37 +01:00
Dan Poltawski
06dcb573c4 Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle 2012-04-30 17:00:23 +08:00
Petr Skoda
46cb5d9ace MDL-32589 remove bogus webproxy whitelisting
Thanks Dan Poltawski!
2012-04-30 08:35:16 +02:00
Dan Poltawski
b53cb1294a Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-04-30 12:54:22 +08:00
Dan Poltawski
81ea734992 Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle 2012-04-30 09:16:24 +08:00
Sam Hemelryk
3d173c1d38 Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle 2012-04-30 12:33:05 +12:00
Dan Marsden
77143217f2 MDL-31731 - new grading form - Marking Guide 2012-04-30 08:44:43 +12:00
Petr Skoda
0be17303c0 MDL-32676 improve YUI init performance via combo loader caching 2012-04-29 19:00:51 +02:00
Petr Skoda
ee891dacc7 MDL-32612 disable error displaying in theme files and javascript
The correct place to write errors and notices is log, we can let Javascript and binary files to be randomly modified.
2012-04-28 17:14:38 +02:00
Petr Skoda
463a9874ef MDL-32612 respect NO_DEBUG_DISPLAY in scripts that need only config.php 2012-04-28 17:14:37 +02:00
Petr Skoda
32962961a8 MDL-32651 increase memory limit to 2G when running phpunit tests
This should help when running tests with coverage reports.
2012-04-27 13:54:38 +02:00
Petr Skoda
b814d1b4b2 MDL-32607 prevent upgrade_set_timeout abort in CLI scripts
Credit goes to Michael Aherne, thanks.
2012-04-27 13:51:38 +02:00
Petr Skoda
366c6adba3 MDL-32589 phpunit: allow proxy server specification via config.php 2012-04-27 13:43:21 +02:00
Petr Skoda
8e5c963e6b MDL-32587 improve component phpunit config building and make the util.php help fit 80char screens 2012-04-27 13:42:18 +02:00
Eloy Lafuente (stronk7)
cb48174266 MDL-32587 phpunit: new option to create distributed phpunit.xml files 2012-04-27 13:42:17 +02:00
Petr Skoda
51b7297b7e MDL-32586 silence buggy glibc when fixing utf-8 strings 2012-04-27 13:41:12 +02:00
Petr Skoda
6c0e5cd193 MDL-19071 test PCRE compatibility with unicode characters 2012-04-27 13:37:54 +02:00
Eloy Lafuente (stronk7)
291e168894 Revert "MDL-32249 completion: Round course grades and remove hardcoded string"
This reverts commit 412cecc32b.
2012-04-27 12:03:26 +02:00
Dan Poltawski
70b36b488b MDL-31263 lib/ajax/blocks.php fix nonsensical url 2012-04-26 11:03:05 +08:00
Eloy Lafuente (stronk7)
ee5855687e Merge branch 'MDL-31052-js-rewrite' of git://github.com/danpoltawski/moodle 2012-04-26 03:32:08 +02:00
Eloy Lafuente (stronk7)
d7f84a2962 Merge branch 'MDL-32471-thumbnails' of git://github.com/mudrd8mz/moodle 2012-04-25 15:14:27 +02:00
David Mudrak
f7eec6ce79 MDL-32471 improved SQL to prevent potential full table scans 2012-04-25 13:44:36 +02:00
David Mudrak
94d104172e MDL-32471 just a trivial change to prevent eventual issues with various preview modes 2012-04-25 11:53:57 +02:00
David Mudrak
8f110835c1 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
2012-04-25 11:42:17 +02:00
Eloy Lafuente (stronk7)
795558d3e5 Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle 2012-04-24 21:56:57 +02:00
David Mudrak
fe68aac7d9 MDL-32471 using === for string comparison
Thanks to Petr Skoda for spotting this during the peer-review.
2012-04-24 16:10:46 +02:00
David Mudrak
9120a46257 MDL-32471 remove orphaned preview files via cron 2012-04-24 15:14:09 +02:00
David Mudrak
7a00d4385d 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.
2012-04-24 14:29:44 +02:00
David Mudrak
957fc845b6 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.
2012-04-24 14:01:53 +02:00
Eloy Lafuente (stronk7)
2ea2549e13 MDL-31914 db fix - cannot use table aliases on DELETE statements. Credit goes to Andrew Nicols (LUNS). 2012-04-24 13:07:11 +02:00
Eloy Lafuente (stronk7)
c833026b24 Merge branch 'MDL-32249' of github.com:srynot4sale/moodle 2012-04-24 12:56:30 +02:00
Andrew Robert Nicols
ede323e2b3 MDL-31914 Ensure that completion criteria are deleted when removing a course module
Conflicts:

	lib/db/upgrade.php
	version.php
2012-04-24 12:25:53 +02:00
David Mudrak
261cbbacc1 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.
2012-04-24 12:09:45 +02:00
David Mudrak
82c224ee7a 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).
2012-04-24 12:09:45 +02:00
David Mudrak
c4d19c5a07 MDL-32471 introducing file_storage::get_file_preview() method 2012-04-24 12:09:45 +02:00
David Mudrak
f0a23f5322 MDL-32471 introducing generate_image_thumbnail() function
This helper function uses GD library to generate a thumbnail of the
given image file.
2012-04-24 12:09:45 +02:00
David Mudrak
f0f4fff900 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
<
2012-04-24 12:09:44 +02:00
David Mudrak
796495fed2 MDL-32471 changing the interface of the send_stored_file() 2012-04-24 12:09:44 +02:00
David Mudrak
b071498f1b MDL-32471 pluginfile.php accepts optional parameter 'preview' 2012-04-24 12:09:44 +02:00
Ruslan Kabalin
5683815612 MDL-31263 Rewrite block drag/drop using YUI3 2012-04-24 13:25:43 +08:00
Dan Poltawski
8e8f247f2c Merge branch 'w17_MDL-32427_m23_protocols' of git://github.com/skodak/moodle 2012-04-24 10:27:15 +08:00
Ruslan Kabalin
ae2afddcd6 MDL-31222 Create a core YUI3 Module for drag-drop 2012-04-23 21:28:39 +01:00