Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PHP 5.4 is now required for master | Lukas Reschke | 2014-12-04 | 1 | -11/+2 |
| | | | | :beers: | ||||
* | 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 | ||||
| * | | | | | | 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 #12486 from owncloud/activity_priorities | Lukas Reschke | 2014-11-28 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | add activity priorities to core so that other apps can reuse it | ||||
| * | | | | | | | add activity priorities to core so that other apps can reuse it | Bjoern Schiessle | 2014-11-28 | 1 | -0/+7 |
| |/ / / / / / | |||||
* | | | | | | | 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 | 6 | -16/+112 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add functions to modify cookies to response class | ||||
| * | | | | | | | Pass \OC::$WEBROOT to the ctr | Lukas Reschke | 2014-11-27 | 2 | -5/+12 |
| | | | | | | | | |||||
| * | | | | | | | Remove redundant code | Lukas Reschke | 2014-11-27 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Use server container | Lukas Reschke | 2014-11-27 | 3 | -1/+17 |
| | | | | | | | | |||||
| * | | | | | | | Add functions to modify cookies to response class | Lukas Reschke | 2014-11-27 | 3 | -9/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -98/+171 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Issue/6101 Make all interfaces/classes autoloadable | ||||
| * | | | | | | | | Move NaturalSort_DefaultCollator to its own file | Joas Schilling | 2014-11-27 | 2 | -11/+19 |
| | | | | | | | | | |||||
| * | | | | | | | | Move iHomeStorage to own file | Joas Schilling | 2014-11-27 | 2 | -4/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | Move share interfaces to own files so they can be autoloaded | Joas Schilling | 2014-11-27 | 4 | -83/+128 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #12479 from rclarkson/master | Morris Jobke | 2014-11-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Limit blacklist to php files | ||||
| * | | | | | | | | Limit blacklist to php files | Richard Clarkson | 2014-11-27 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect. I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively This contribution is MIT licensed | ||||
* / | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-28 | 4 | -2/+4 |
|/ / / / / / / |