Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 66 | -250/+28 |
| | |||||
* | Remove checks for safe mode and magic quotes | Lukas Reschke | 2014-12-05 | 3 | -25/+1 |
| | | | | | | | | | | Both are removed from 5.4.0 Safe Mode: http://php.net/manual/en/features.safe-mode.php > This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. Magic Quotes: http://php.net/manual/en/security.magicquotes.php > This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. | ||||
* | Merge pull request #12561 from oparoz/vectoricon | Morris Jobke | 2014-12-05 | 1 | -1/+4 |
|\ | | | | | Improve the bitmap and vector mime icons | ||||
| * | Improve the bitmap and vector mime icons | Olivier Paroz | 2014-12-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | * Vector files such as Illustrator files currently show the "image" icon. I propose to add a new type to mimetypeIcon() called "image/vector" and which would be used by SVG as well * We can use the current image-svg+xml icon, but would simply rename it to image-vector * The black and white "image" icon looks too much like a settings icon. A simple picture representation pasted over the file icon should work | ||||
* | | Merge pull request #12583 from owncloud/trim-port | Morris Jobke | 2014-12-05 | 2 | -10/+25 |
|\ \ | | | | | | | Trim port from domain | ||||
| * | | Add workaround for older instances | Lukas Reschke | 2014-12-03 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | To be removed with oCAdd workaround for older instances To be removed with oC99 | ||||
| * | | Trim port from domain | Lukas Reschke | 2014-12-03 | 2 | -8/+18 |
| | | | | | | | | | | | | | | | | | | Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500) To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain) | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 70 | -70/+80 |
| | | | |||||
* | | | Merge pull request #12619 from owncloud/use-also-original-hea | Morris Jobke | 2014-12-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Merge headers | ||||
| * | | | Merge headers | Lukas Reschke | 2014-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV. | ||||
* | | | | Merge pull request #12616 from owncloud/node-fileinfo | Morris Jobke | 2014-12-04 | 3 | -28/+60 |
|\ \ \ \ | | | | | | | | | | | make \OC\Files\Node\Node implement the FileInfo interface | ||||
| * | | | | make \OC\Files\Node\Node implement the FileInfo interface | Robin Appelman | 2014-12-04 | 3 | -28/+60 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12607 from owncloud/this-is-an-awesome-day | Clark Tomlinson | 2014-12-04 | 1 | -11/+2 |
|\ \ \ \ | |_|/ / |/| | | | PHP 5.4 is now required for master | ||||
| * | | | PHP 5.4 is now required for master | Lukas Reschke | 2014-12-04 | 1 | -11/+2 |
| |/ / | | | | | | | | | | :beers: | ||||
* | | | Merge pull request #12609 from owncloud/remove-53-fixme | Thomas Müller | 2014-12-04 | 1 | -18/+2 |
|\ \ \ | | | | | | | | | Remove workaround for 5.3 | ||||
| * | | | Remove workaround for 5.3 | Lukas Reschke | 2014-12-04 | 1 | -18/+2 |
| |/ / | | | | | | | | | | Function is natively available with 5.4 | ||||
* | | | no nested xml tags on dependencies | Thomas Müller | 2014-12-04 | 1 | -2/+2 |
| | | | |||||
* | | | fix an issue where the types tag holds an empty string | Thomas Müller | 2014-12-04 | 1 | -4/+8 |
| | | | |||||
* | | | adjust dependency analyzer to use attributes properly | Thomas Müller | 2014-12-04 | 1 | -14/+27 |
| | | | |||||
* | | | switch to different parsing implementation to get xml attributes properly ↵ | Thomas Müller | 2014-12-04 | 1 | -1/+56 |
| | | | | | | | | | | | | handled | ||||
* | | | adding supported databases | Thomas Müller | 2014-12-04 | 2 | -0/+32 |
| | | | |||||
* | | | introduce dependency analyzer to take care of app dependencies | Thomas Müller | 2014-12-04 | 3 | -2/+79 |
| | | | | | | | | | | | | some more unit tests on xml info parser | ||||
* | | | adding default key value pair for 'types' | Thomas Müller | 2014-12-04 | 1 | -0/+3 |
| | | | |||||
* | | | translate labels properly | Thomas Müller | 2014-12-04 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood | Lukas Reschke | 2014-12-03 | 1 | -1/+1 |
|\ \ | | | | | | | Stop flooding the log, when previews are disabled | ||||
| * | | Stop flooding the log, when previews are disabled | Joas Schilling | 2014-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12553 from owncloud/default-iosid | Thomas Müller | 2014-12-03 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | add missing public interface for iOS client app id | ||||
| * | | add missing public interface for iOS client app id | Morris Jobke | 2014-12-02 | 1 | -0/+8 |
| |/ | |||||
* | | Merge pull request #10881 from owncloud/touch-statcache | Robin Appelman | 2014-12-02 | 2 | -0/+2 |
|\ \ | | | | | | | Clear statcache before getting the mtime from local storage backends | ||||
| * | | also clear statcache in mapped local | Robin Appelman | 2014-12-02 | 1 | -0/+1 |
| | | | |||||
| * | | Clear statcache before getting the mtime from local storage backends | Robin Appelman | 2014-12-02 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #11975 from owncloud/Combustible-combustible_dev | Morris Jobke | 2014-12-02 | 1 | -254/+267 |
|\ \ | |/ |/| | Check imagecreate*() return before using and use logger in \OC_Image | ||||
| * | Use \OCP\ILogger | Thomas Müller | 2014-12-01 | 1 | -257/+264 |
| | | |||||
| * | Added error check to lib/private/image.php | Byron Marohn | 2014-12-01 | 1 | -0/+6 |
| | | | | | | | | | | | | | | This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE. Without this check, subsequent loop might create billions of ERROR-level log messages. Signed-off-by: Byron Marohn <combustible@live.com> | ||||
* | | Merge pull request #12310 from kampka/master | Thomas Müller | 2014-12-02 | 1 | -0/+48 |
|\ \ | | | | | | | Implement a logger to log to error_log | ||||
| * | | Implement a logger to log to error_log | Christian Kampka | 2014-12-01 | 1 | -0/+48 |
| | | | |||||
* | | | Merge pull request #12419 from owncloud/read-only-config | Thomas Müller | 2014-12-01 | 2 | -3/+11 |
|\ \ \ | |_|/ |/| | | Allow read-only configuration | ||||
| * | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | | | Workaround required for IIS setups running ownCloud to prevent dataloss. Long-term solution would be to move some configuration settings to the database | ||||
* | | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped | Vincent Petry | 2014-12-01 | 1 | -2/+21 |
|\ \ \ | | | | | | | | | Issue/12460 port local changes2mapped | ||||
| * | | | Also clearstatcache() in MappedLocal before using the stats | Joas Schilling | 2014-11-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Local change 283c10f010f5da4ca0b6b7658ac1fa730b8858bf | ||||
| * | | | Check whether file exists before trying to touch() it | Joas Schilling | 2014-11-27 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Local changes from d069ee8a8bce6a08d8b7921ad378c60af2a0439e and 258ad38fd3c1e3cdc4ec20238b166e78c334b814 | ||||
| * | | | Check return of disk_free_space before returning it | Joas Schilling | 2014-11-27 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Local changes copied from ed8359737199a8a6640986e00df80d971aa6e1d7 and 25370fcb8235d2129cab0f8a5843c4784b3673d0 | ||||
| * | | | Check file existance in MappedLocal in hasUpdated() | Joas Schilling | 2014-11-27 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | Only fixed in Local by eeee9eacea333035e22ef3ed938e36f56bc762cd | ||||
| * | | | Make MappedLocal::isLocal() true like for Local | Joas Schilling | 2014-11-27 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | Missed in 788c8540aa6aac50795c37b088eeaa561d44b86c | ||||
* | | | | Merge pull request #12427 from ↵ | Lukas Reschke | 2014-12-01 | 1 | -3/+88 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue/6101-deprecate-namespaced-functions Depcrate namespaced functions, since they can not be autoloaded | ||||
| * | | | | Depcrate namespaced functions, since they can not be autoloaded | Joas Schilling | 2014-11-26 | 1 | -3/+88 |
| | | | | | |||||
* | | | | | Merge pull request #12398 from oparoz/patch-5 | Morris Jobke | 2014-11-30 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | You can only change the oritentation of a JPEG | ||||
| * | | | | | You can only change the oritentation of a JPEG | Olivier Paroz | 2014-11-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TIFFs also have EXIF headers, but they're not supported by the Image class PHP doc http://php.net/manual/en/function.exif-read-data.php | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-29 | 2 | -0/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #12499 from owncloud/disableMSSQL | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Disable MSSQL and OCI for new CE installations |