Commit Graph

19 Commits

Author SHA1 Message Date
Vincent Petry 746be98e03 Merge pull request #13654 from oparoz/tmpfile-with-extension
Keep the extension in temp files
2015-03-26 23:08:08 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Olivier Paroz 60b1643f02 Fix the office class
The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
2015-03-19 16:09:09 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Joas Schilling 3ec42ad598 Split office providers into one class per file 2014-11-28 09:28:30 +01:00
Joas Schilling fca9d32545 Move registration of core preview providers to preview
So the class files only have class code and don't execute code
2014-11-27 19:40:23 +01:00
Olivier Paroz bbc2d7cf4f Typ in whichOpenOffice test 2014-09-04 12:54:20 +02:00
Georg Ehrke b68098ebba remove preview office fallback as it makes too much trouble and generates inacceptable results 2014-04-28 12:05:10 +02:00
Georg Ehrke eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Georg Ehrke dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Georg Ehrke f62f1658ce suppress error msg caused by php bug 2014-02-14 11:23:39 +01:00
Georg Ehrke d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Thomas Müller 07a84aa5eb reuse existing helper function OC_Helper::is_function_enabled 2014-01-07 14:52:18 +01:00
Georg Ehrke 4c5959e1f5 fix comment 2013-10-17 15:19:15 +02:00
Georg Ehrke 521277b8b6 only call shell_exec if enabled 2013-10-17 14:31:07 +02:00
Thomas Müller e3489b36ff any preview requiring the which command will not be used on Windows 2013-10-15 00:15:45 +02:00
Thomas Müller 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