eb5265b106
fix merge conflicts
2014-03-06 11:55:45 +01:00
dbf83aada2
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-05 15:57:45 +01:00
43b1d81f77
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-02-21 13:45:57 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
f62f1658ce
suppress error msg caused by php bug
2014-02-14 11:23:39 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
d55ef442cd
properly check if pdf and svg modules are installed
2014-02-04 12:59:14 +01:00
07a84aa5eb
reuse existing helper function OC_Helper::is_function_enabled
2014-01-07 14:52:18 +01:00
14e7075030
we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
...
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
c22019dec5
Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that
2013-11-22 12:20:06 +01:00
926b274200
Movie preview - use frame after 5 seconds
2013-11-15 01:46:51 +01:00
617dc0e468
Merge branch 'master' into moviepreviewfallback
...
Conflicts:
lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
99ee95d46c
Added missing escaping
2013-11-11 15:41:03 +01:00
df288605d4
Fixed undefined variable error when using avconv
2013-11-10 11:46:46 +01:00
4b5083e3ca
Fixed the rebellous space, replaced with a tab
2013-11-08 12:27:53 +01:00
0c6af55112
Added ffmpeg fallback when avconv is not available
...
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.
Fixes #5745
Also, this now uses exec() instead of shell_exec() to be able to get the
return code.
The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.
Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
19ea4f79da
resize svg without loosing quality
2013-10-11 00:12:37 +02:00
be4aea2d1b
fix indentation
2013-10-07 13:21:20 +02:00
e078fc3eda
fix wrong variable name
2013-10-07 13:19:21 +02:00
3b5dc51be4
fix doc block of OC\Preview\Provider::getThumbnail()
2013-10-07 13:19:21 +02:00
8a35d79a39
check if svg of filetype icon exists
2013-10-07 13:19:21 +02:00
f81053072f
use readImage instead of readImageBlob
2013-10-07 13:19:21 +02:00
d410faf11c
fix new extension
2013-10-07 13:19:21 +02:00
4ac3ecace2
use svg to generate filetype icon if imagick available
2013-10-07 13:19:20 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Georg Ehrke
Philipp Schmitt
Thomas Müller
Jörn Friedrich Dreyer
Morris Jobke
Thomas Tanghus
Vincent Petry
Frank Karlitschek