Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PHP 5.4 is now required for master | Lukas Reschke | 2014-12-04 | 3 | -27/+3 |
| | | | | :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 #12556 from owncloud/add-route-for-versions | Thomas Müller | 2014-12-03 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Add route for download of versions | ||||
| * | | | Add route for download of versions | Lukas Reschke | 2014-12-02 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise on master it was not possible anymore to download older versions. Fixes itself. | ||||
* | | | | Merge pull request #12563 from owncloud/usermenu-remove-border | Volkan Gezer | 2014-12-03 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | remove border from user menu, adjust to apps menu | ||||
| * | | | | remove border from user menu, adjust to apps menu | Jan-Christoph Borchardt | 2014-11-28 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #12565 from owncloud/config-sample-databases | Vincent Petry | 2014-12-03 | 1 | -7/+13 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | add proper description what database is supported by CE and EE | ||||
| * | | | | add proper description what database is supported by CE and EE | Morris Jobke | 2014-12-03 | 1 | -7/+13 |
| | | | | | |||||
* | | | | | Merge pull request #12554 from owncloud/versions-app-autoload | Lukas Reschke | 2014-12-03 | 5 | -8/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Autoload lib files of versions app | ||||
| * | | | | Autoload exception from files_trashbin | Joas Schilling | 2014-12-02 | 2 | -2/+0 |
| | | | | | |||||
| * | | | | Autoload lib files of versions app | Joas Schilling | 2014-12-02 | 3 | -6/+0 |
| | |_|/ | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-03 | 24 | -88/+128 |
| | | | | |||||
* | | | | 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 #12333 from owncloud/delete-selected-files | Morris Jobke | 2014-12-02 | 3 | -10/+42 |
|\ \ \ \ | | | | | | | | | | | Fix deleting non deletable files by selecting them | ||||
| * | | | | Add js unit test | Robin Appelman | 2014-11-26 | 1 | -7/+27 |
| | | | | | |||||
| * | | | | Dont show the delete button for selected files if one of the selected files ↵ | Robin Appelman | 2014-11-26 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | is not deletable | ||||
| * | | | | Check if files are deletable before trying to delete them | Robin Appelman | 2014-11-26 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | 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 | 2 | -2/+52 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Implement a logger to log to error_log | ||||
| * | | | | Implement a logger to log to error_log | Christian Kampka | 2014-12-01 | 2 | -2/+52 |
| | | | | | |||||
* | | | | | Merge pull request #12419 from owncloud/read-only-config | Thomas Müller | 2014-12-01 | 5 | -6/+38 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Allow read-only configuration | ||||
| * | | | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 5 | -6/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-01 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | 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-30 | 4 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-29 | 12 | -10/+26 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #12499 from owncloud/disableMSSQL | Lukas Reschke | 2014-11-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Disable MSSQL and OCI for new CE installations | ||||
| * | | | | | | | | Adjust sample config | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | 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 | 2 | -4/+19 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | activitymanager: concatenate queries with 'or' | ||||
| * | | | | | | | | concatenate queries with 'or' | Bjoern Schiessle | 2014-11-28 | 2 | -4/+19 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
| |/ / / / / / / / |