summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix ip detection for swift-cephRobin Appelman2015-11-161-1/+1
|
* Skip Swift stat testRobin McCorkell2015-10-201-0/+4
|
* Don't attempt to run tests unless start file is successfulRobin McCorkell2015-10-202-41/+46
|
* Detect Docker initialization properlyRobin McCorkell2015-10-206-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 existRobin McCorkell2015-10-201-9/+13
|
* Replace Swift Docker test with Ceph imageRobin McCorkell2015-10-202-22/+38
|
* [files_external] swift testsMorris Jobke2015-10-203-5/+106
|
* Merge pull request #19748 from owncloud/update-preventcloseThomas Müller2015-10-201-0/+9
|\ | | | | Prevent leaving the DB update page while in progress
| * Allow leaving update page when errors occurredVincent Petry2015-10-201-0/+2
| |
| * Prevent leaving the DB update page while in progressVincent Petry2015-10-201-0/+7
| |
* | Merge pull request #18399 from owncloud/api-getusers-for-subadminsThomas Müller2015-10-203-3/+104
|\ \ | | | | | | enable api getUsers for subadmins
| * \ Merge branch 'master' into api-getusers-for-subadminsmichag862015-10-132199-18747/+40711
| |\ \
| * | | [provisioning api] Updated testsRoeland Jago Douma2015-08-261-1/+77
| | | | | | | | | | | | | | | | | | | | * Test pass again * Code coverage getUsers is at 100% again
| * | | enable api getUsers for subadminsmichag862015-08-262-2/+27
| | | | | | | | | | | | | | | | Now subadmins can get a list of users they are subadmins of.
* | | | Merge pull request #19636 from owncloud/share_expire_backgrounThomas Müller2015-10-205-1/+283
|\ \ \ \ | | | | | | | | | | Add backgroundjob to expire link shares
| * | | | use correct class nameMorris Jobke2015-10-202-2/+2
| | | | |
| * | | | Add backgroundjob to expire link sharesRoeland Jago Douma2015-10-205-1/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple background job to expire the link shares. * added unit tests
* | | | | Merge pull request #19742 from owncloud/shareinfo_performanceThomas Müller2015-10-203-14/+0
|\ \ \ \ \ | | | | | | | | | | | | Do not calculate non essential info
| * | | | | Do not calculate non essential infoRoeland Jago Douma2015-10-133-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_exceptionThomas Müller2015-10-201-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | catch all exception if table doesn't exists
| * | | | | catch all exception if table doesn't existsBjörn Schießle2015-10-201-1/+1
| | | | | |
* | | | | | Merge pull request #19874 from ↵Thomas Müller2015-10-202-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | owncloud/delete-cookie-instead-of-setting-value-to-empty Delete cookie instead of emptying value
| * | | | | Delete cookie instead of emptying valueLukas Reschke2015-10-192-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.phpThomas Müller2015-10-201-55/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove apps/files/appinfo/remote.php - this is no longer used
| * | | | | | Remove apps/files/appinfo/remote.php - this is no longer usedThomas Müller2015-10-161-55/+0
| | | | | | |
* | | | | | | Merge pull request #19666 from owncloud/fix_13002Thomas Müller2015-10-203-80/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Combine OCS API getUser method code into provisioning_api app
| * | | | | | | Combine OCS API getUser method code into provisioning_api appRoeland Jago Douma2015-10-133-80/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API.
* | | | | | | | Merge pull request #19859 from owncloud/fix-long-groupnamesThomas Müller2015-10-201-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977
| * | | | | | | | ellipsize long group names in select2 dropdown, fix #16977Jan-Christoph Borchardt2015-10-191-1/+12
| | | | | | | | |
* | | | | | | | | Merge pull request #19878 from owncloud/fix-filepicker-loading-spinnerThomas Müller2015-10-202-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix filepicker loading spinner
| * | | | | | | | | fix filepicker loading spinnerChristoph Wurst2015-10-192-4/+4
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19879 from owncloud/oci-setup-static-to-objectThomas Müller2015-10-201-15/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [OCI setup] remove static logger/config calls
| * | | | | | | | | [OCI setup] remove static logger/config callsMorris Jobke2015-10-201-15/+17
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * logger/config object are already injected - this only uses it
* / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-2010-6/+66
|/ / / / / / / /
* | | | | | | | Merge pull request #17641 from owncloud/fix_objectstore_renameJörn Friedrich Dreyer2015-10-1916-66/+150
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | don't move files in cache twice, fixes renaming for objectstores
| * | | | | | | | Fix error in stop scriptThomas Müller2015-10-161-11/+13
| | | | | | | | |
| * | | | | | | | Fix termination of the ceph dockerThomas Müller2015-10-161-1/+2
| | | | | | | | |
| * | | | | | | | Fix termination of the ceph dockerThomas Müller2015-10-161-1/+1
| | | | | | | | |
| * | | | | | | | fix encryption migration testRobin Appelman2015-10-161-0/+25
| | | | | | | | |
| * | | | | | | | Fix listing of trash files in testRobin Appelman2015-10-161-0/+2
| | | | | | | | |
| * | | | | | | | Fix trashbin handling of unknown/unlimited free spaceRobin Appelman2015-10-161-2/+3
| | | | | | | | |
| * | | | | | | | Fix rename shared versions testRobin Appelman2015-10-161-3/+2
| | | | | | | | |
| * | | | | | | | handle versions expire for home storages with unlimited quotaRobin Appelman2015-10-161-8/+12
| | | | | | | | |
| * | | | | | | | fix delete orphan shares test with object home storageRobin Appelman2015-10-161-1/+6
| | | | | | | | |
| * | | | | | | | Fix preserving file ids when restoring a file with object storageRobin Appelman2015-10-161-1/+14
| | | | | | | | |
| * | | | | | | | fix objectstore files having create permissionsRobin Appelman2015-10-161-2/+2
| | | | | | | | |
| * | | | | | | | dont assume home storage is local in trash testRobin Appelman2015-10-161-13/+15
| | | | | | | | |
| * | | | | | | | Make shared folder size propagation test work with object home storageRobin Appelman2015-10-162-7/+5
| | | | | | | | |
| * | | | | | | | detect object homestorage in share codeRobin Appelman2015-10-161-1/+3
| | | | | | | | |
| * | | | | | | | Fix shared storage tests for non local home storageRobin Appelman2015-10-161-3/+3
| | | | | | | | |