mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity
52,730 Commits 36 Branches 519 Tags
Commit Graph

52730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Mouneyrac
4615817d1c MDL-30986 external API, check and update DocBlock 
Conflicts:

	group/externallib.php
 2012-04-30 15:11:56 +08:00
Eloy Lafuente (stronk7)
aa753ac24f weekly release 2.3dev 2012-04-27 12:46:57 +02:00
Eloy Lafuente (stronk7)
cb6de349e4 Fix permissions 2012-04-27 12:45:22 +02:00
Eloy Lafuente (stronk7)
cef0090c51 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-04-27 12:38:28 +02:00
Eloy Lafuente (stronk7)
291e168894 Revert "MDL-32249 completion: Round course grades and remove hardcoded string" 
This reverts commit 412cecc32bd33b108008791090f420b6892b4cac.
 2012-04-27 12:03:26 +02:00
Eloy Lafuente (stronk7)
7c0d3f4c1d Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle 2012-04-27 03:15:51 +02:00
AMOS bot
66cf7bcbe9 Automatically generated installer lang files 2012-04-27 00:31:39 +00:00
Andrew Robert Nicols
95ef704d7d MDL-31096 Handle addition/removal of mod-indent-huge to match non-ajax display 2012-04-26 11:02:39 +01:00
Andrew Robert Nicols
eac3ed52c7 MDL-31096 Add hiding of activity descriptions 2012-04-26 10:40:32 +01:00
Andrew Robert Nicols
9d40f585da 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.
 2012-04-26 17:25:06 +08:00
Jason Fowler
06aad19cc7 MDL-26014 - blog - improving the label for the URL of an external blog feed 2012-04-26 11:09:44 +08: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)
e97eefd8c8 Merge branch 'MDL-19263-master' of https://github.com/mackensen/moodle 2012-04-26 02:46:21 +02:00
Eloy Lafuente (stronk7)
0529f63373 Merge branch 'MDL-32630-workshop-calendar' of git://github.com/mudrd8mz/moodle 2012-04-26 02:17:00 +02:00
David Mudrak
de7daa8333 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).
 2012-04-25 15:35:59 +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
b861b60932 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()
 2012-04-25 13:48:12 +02:00
David Mudrak
f7eec6ce79 MDL-32471 improved SQL to prevent potential full table scans 2012-04-25 13:44:36 +02:00
Eloy Lafuente (stronk7)
e69ac1546b Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis/moodle 2012-04-25 13:07:48 +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)
9c51f675fa Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle 2012-04-25 03:40:53 +02:00
Eloy Lafuente (stronk7)
344c07c3de Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle 2012-04-25 03:20:23 +02:00
Eloy Lafuente (stronk7)
2360f60fd8 MDL-32322 tests: apply changes in simpletests (now deleted) to phpunit ones. 2012-04-25 03:09:42 +02:00
Eloy Lafuente (stronk7)
d3cb25dfef 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
 2012-04-25 03:02:14 +02:00
Eloy Lafuente (stronk7)
2c6dbf4a54 MDL-32490 Offline assignment: phpdocs and whitespace fixes 2012-04-25 02:40:35 +02:00
AMOS bot
10686a150c Automatically generated installer lang files 2012-04-25 00:31:34 +00:00
Eloy Lafuente (stronk7)
2ae4f3849a Merge branch 'MDL-32490' of git://github.com/bostelm/moodle 2012-04-25 02:28:50 +02:00
Eloy Lafuente (stronk7)
cb626376c1 Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle 2012-04-25 02:05:09 +02:00
Eloy Lafuente (stronk7)
0317b8d4b3 Merge branch 'MDL-32082_messaging_readability' of git://github.com/andyjdavis/moodle 2012-04-25 01:55:24 +02:00
Eloy Lafuente (stronk7)
ee35fa43de Merge branch 'wip-MDL-30478-master' of git://github.com/abgreeve/moodle 2012-04-25 01:11:38 +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
Eloy Lafuente (stronk7)
14ffb91959 Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle 2012-04-24 10:37:13 +02:00
Petr Skoda
3932d474e3 MDL-32574 fi sqlsrv adodb test 2012-04-24 09:22:26 +02:00
Dan Poltawski
e5055d3e5e Merge branch 'master_MDL-32102' of git://github.com/danmarsden/moodle 2012-04-24 15:17:43 +08:00