Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix ip detection for swift-ceph | Robin Appelman | 2015-11-16 | 1 | -1/+1 |
| | |||||
* | Skip Swift stat test | Robin McCorkell | 2015-10-20 | 1 | -0/+4 |
| | |||||
* | Don't attempt to run tests unless start file is successful | Robin McCorkell | 2015-10-20 | 2 | -41/+46 |
| | |||||
* | Detect Docker initialization properly | Robin McCorkell | 2015-10-20 | 6 | -24/+96 |
| | | | | | Use netcat to check when the port opens, rather than an arbitrary timeout. Hard limit of 60 seconds in case something breaks | ||||
* | Make Swift test robust if container didn't exist | Robin McCorkell | 2015-10-20 | 1 | -9/+13 |
| | |||||
* | Replace Swift Docker test with Ceph image | Robin McCorkell | 2015-10-20 | 2 | -22/+38 |
| | |||||
* | [files_external] swift tests | Morris Jobke | 2015-10-20 | 3 | -5/+106 |
| | |||||
* | Merge pull request #19748 from owncloud/update-preventclose | Thomas Müller | 2015-10-20 | 1 | -0/+9 |
|\ | | | | | Prevent leaving the DB update page while in progress | ||||
| * | Allow leaving update page when errors occurred | Vincent Petry | 2015-10-20 | 1 | -0/+2 |
| | | |||||
| * | Prevent leaving the DB update page while in progress | Vincent Petry | 2015-10-20 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #18399 from owncloud/api-getusers-for-subadmins | Thomas Müller | 2015-10-20 | 3 | -3/+104 |
|\ \ | | | | | | | enable api getUsers for subadmins | ||||
| * \ | Merge branch 'master' into api-getusers-for-subadmins | michag86 | 2015-10-13 | 2199 | -18747/+40711 |
| |\ \ | |||||
| * | | | [provisioning api] Updated tests | Roeland Jago Douma | 2015-08-26 | 1 | -1/+77 |
| | | | | | | | | | | | | | | | | | | | | * Test pass again * Code coverage getUsers is at 100% again | ||||
| * | | | enable api getUsers for subadmins | michag86 | 2015-08-26 | 2 | -2/+27 |
| | | | | | | | | | | | | | | | | Now subadmins can get a list of users they are subadmins of. | ||||
* | | | | Merge pull request #19636 from owncloud/share_expire_backgroun | Thomas Müller | 2015-10-20 | 5 | -1/+283 |
|\ \ \ \ | | | | | | | | | | | Add backgroundjob to expire link shares | ||||
| * | | | | use correct class name | Morris Jobke | 2015-10-20 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Add backgroundjob to expire link shares | Roeland Jago Douma | 2015-10-20 | 5 | -1/+283 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple background job to expire the link shares. * added unit tests | ||||
* | | | | | Merge pull request #19742 from owncloud/shareinfo_performance | Thomas Müller | 2015-10-20 | 3 | -14/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not calculate non essential info | ||||
| * | | | | | Do not calculate non essential info | Roeland Jago Douma | 2015-10-13 | 3 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to calculate a human readable date on the server side. We supply the mtime and a client can easily convert that himself if needed. This is already done most of the time since the date is often not in the exact right format. There is also no need to attach icon info. We have that available in javascript. And else the client should get the right icon based on the mimetype for its platform. * Updated tests | ||||
* | | | | | | Merge pull request #19884 from owncloud/locking_exception | Thomas Müller | 2015-10-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | catch all exception if table doesn't exists | ||||
| * | | | | | catch all exception if table doesn't exists | Björn Schießle | 2015-10-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #19874 from ↵ | Thomas Müller | 2015-10-20 | 2 | -2/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | owncloud/delete-cookie-instead-of-setting-value-to-empty Delete cookie instead of emptying value | ||||
| * | | | | | Delete cookie instead of emptying value | Lukas Reschke | 2015-10-19 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP will handle session cookies with an empty values as an E_WARNING error. ([php/#68063](https://bugs.php.net/bug.php?id=68063)) ownCloud sets the cookie to an empty value in case the session expires, it however after this starts a new session. Due to potential race conditions this can in unlikely cases lead to the fact that the session never gets restarted and the user is left with an empty cookie. PHP tries then to use the empty cookie which makes the instance not usable. To work around any race condition we now tell PHP to explicitly delete the value which can be done by using `null` as value, PHP will then send a cookie with the value "deleted". Also theepiration has been set to -1. | ||||
* | | | | | | Merge pull request #19838 from owncloud/remove-files-remote.php | Thomas Müller | 2015-10-20 | 1 | -55/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove apps/files/appinfo/remote.php - this is no longer used | ||||
| * | | | | | | Remove apps/files/appinfo/remote.php - this is no longer used | Thomas Müller | 2015-10-16 | 1 | -55/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19666 from owncloud/fix_13002 | Thomas Müller | 2015-10-20 | 3 | -80/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Combine OCS API getUser method code into provisioning_api app | ||||
| * | | | | | | | Combine OCS API getUser method code into provisioning_api app | Roeland Jago Douma | 2015-10-13 | 3 | -80/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API. | ||||
* | | | | | | | | Merge pull request #19859 from owncloud/fix-long-groupnames | Thomas Müller | 2015-10-20 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977 | ||||
| * | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977 | Jan-Christoph Borchardt | 2015-10-19 | 1 | -1/+12 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner | Thomas Müller | 2015-10-20 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix filepicker loading spinner | ||||
| * | | | | | | | | | fix filepicker loading spinner | Christoph Wurst | 2015-10-19 | 2 | -4/+4 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #19879 from owncloud/oci-setup-static-to-object | Thomas Müller | 2015-10-20 | 1 | -15/+17 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [OCI setup] remove static logger/config calls | ||||
| * | | | | | | | | | [OCI setup] remove static logger/config calls | Morris Jobke | 2015-10-20 | 1 | -15/+17 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * logger/config object are already injected - this only uses it | ||||
* / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-20 | 10 | -6/+66 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #17641 from owncloud/fix_objectstore_rename | Jörn Friedrich Dreyer | 2015-10-19 | 16 | -66/+150 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | don't move files in cache twice, fixes renaming for objectstores | ||||
| * | | | | | | | | Fix error in stop script | Thomas Müller | 2015-10-16 | 1 | -11/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix termination of the ceph docker | Thomas Müller | 2015-10-16 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix termination of the ceph docker | Thomas Müller | 2015-10-16 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix encryption migration test | Robin Appelman | 2015-10-16 | 1 | -0/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix listing of trash files in test | Robin Appelman | 2015-10-16 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix trashbin handling of unknown/unlimited free space | Robin Appelman | 2015-10-16 | 1 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix rename shared versions test | Robin Appelman | 2015-10-16 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | handle versions expire for home storages with unlimited quota | Robin Appelman | 2015-10-16 | 1 | -8/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | fix delete orphan shares test with object home storage | Robin Appelman | 2015-10-16 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix preserving file ids when restoring a file with object storage | Robin Appelman | 2015-10-16 | 1 | -1/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | fix objectstore files having create permissions | Robin Appelman | 2015-10-16 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | dont assume home storage is local in trash test | Robin Appelman | 2015-10-16 | 1 | -13/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Make shared folder size propagation test work with object home storage | Robin Appelman | 2015-10-16 | 2 | -7/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | detect object homestorage in share code | Robin Appelman | 2015-10-16 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix shared storage tests for non local home storage | Robin Appelman | 2015-10-16 | 1 | -3/+3 |
| | | | | | | | | |