Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | Stop flooding the log, when previews are disabled | Joas Schilling | 2014-12-03 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -0/+8 |
|\ \ \ | |_|/ |/| | | Allow read-only configuration | ||||
| * | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | 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 #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 | ||||
* | | | | | Merge pull request #12499 from owncloud/disableMSSQL | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Disable MSSQL and OCI for new CE installations | ||||
| * | | | | | Disable OCI as it is unsupported by most CE apps | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Disable MSSQL for new CE installations | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since automatic schema migrations are not yet possible let's disable this for now. | ||||
* | | | | | | Merge pull request #12488 from owncloud/activity_group_multiple_conditions | Lukas Reschke | 2014-11-28 | 1 | -2/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | activitymanager: concatenate queries with 'or' | ||||
| * | | | | | concatenate queries with 'or' | Bjoern Schiessle | 2014-11-28 | 1 | -2/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #12483 from owncloud/issue/6101-preview-providers | Lukas Reschke | 2014-11-28 | 21 | -424/+491 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Issue/6101 Autoload preview providers | ||||
| * | | | | | Split bitmap providers into one per file | Joas Schilling | 2014-11-28 | 7 | -74/+119 |
| | | | | | | |||||
| * | | | | | Split office providers into one class per file | Joas Schilling | 2014-11-28 | 8 | -125/+166 |
| | | | | | | |||||
| * | | | | | Fix intendation and doc blocks of preview providers | Joas Schilling | 2014-11-28 | 8 | -116/+143 |
| | | | | | | |||||
| * | | | | | Move registration of core preview providers to preview | Joas Schilling | 2014-11-27 | 10 | -132/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | So the class files only have class code and don't execute code | ||||
* | | | | | | Merge pull request #12472 from owncloud/modifyCookies | Morris Jobke | 2014-11-28 | 3 | -10/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add functions to modify cookies to response class | ||||
| * | | | | | | Pass \OC::$WEBROOT to the ctr | Lukas Reschke | 2014-11-27 | 1 | -4/+11 |
| | | | | | | | |||||
| * | | | | | | Remove redundant code | Lukas Reschke | 2014-11-27 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Use server container | Lukas Reschke | 2014-11-27 | 2 | -1/+10 |
| | | | | | | | |||||
| * | | | | | | Add functions to modify cookies to response class | Lukas Reschke | 2014-11-27 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code. This PR adds some basic functionalities to add and invalidate cookies. Usage: ```php $response = new TemplateResponse(...); $response->addCookie('foo', 'bar'); $response->invalidateCookie('foo'); $response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00')); ``` Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`. | ||||
* | | | | | | | Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable | Morris Jobke | 2014-11-28 | 2 | -11/+19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Issue/6101 Make all interfaces/classes autoloadable | ||||
| * | | | | | | | Move NaturalSort_DefaultCollator to its own file | Joas Schilling | 2014-11-27 | 2 | -11/+19 |
| | | | | | | | |