mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,097 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

22 Commits

Author SHA1 Message Date
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting 
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
 2014-03-31 21:38:54 +02:00
Thomas Müller cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller 79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Georg Ehrke 3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Georg Ehrke 9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Georg Ehrke c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Georg Ehrke 6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Vincent Petry 1b8cf18c91 Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix 
Fix imagerotate and move loadFromBase64() one up
 2014-03-06 17:18:17 +01:00
Bart Visscher 35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Thomas Müller ab850b961d remove unused code and fix wrong variable names - some PHPDoc updated 2014-02-26 23:56:46 +01:00
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 
Allow passing a root folder to get the used space from in the quota wrapper
 2014-02-20 16:47:59 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
kondou fc01a13811 Fix imagerotate and move loadFromBase64() one up. 
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5

loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
 2014-02-12 22:35:49 +01:00
Robin Appelman 8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Robin Appelman f830ad0e47 Don't create new thumbnails on the write hook 2014-02-04 16:28:41 +01:00
Georg Ehrke 6f21da12e8 encode imagePath and fix documentation of loadFromFile 2014-01-11 12:07:28 +01:00
Georg Ehrke 059c3c8708 fix issue with logging non utf8 chars 2013-12-16 15:38:55 +01:00
Bjoern Schiessle aeefe48cba Revert "use relative paths to create images from a file. This way it also works if" 
This reverts commit 3488f0b77a.
 2013-11-22 18:01:44 +01:00
Bjoern Schiessle 3488f0b77a use relative paths to create images from a file. This way it also works if 
no user is logged in (e.g. public gallery share)
 2013-11-22 12:26:01 +01: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