wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27815 commits 157 branches 562 tags 714 MiB
Commit graph

27815 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin McCorkell
8467dbfa91 Detect Docker initialization properly 
Use netcat to check when the port opens, rather than an arbitrary
timeout. Hard limit of 60 seconds in case something breaks
 2015-10-20 14:45:16 +02:00
Robin McCorkell
70f4e9413f Make Swift test robust if container didn't exist 2015-10-20 14:45:16 +02:00
Robin McCorkell
0de9819da3 Replace Swift Docker test with Ceph image 2015-10-20 14:45:16 +02:00
Morris Jobke
2577a624c0 [files_external] swift tests 2015-10-20 14:45:16 +02:00
Thomas Müller
ad08cfbc5f Merge pull request #19748 from owncloud/update-preventclose 
Prevent leaving the DB update page while in progress
 2015-10-20 14:29:31 +02:00
Thomas Müller
60abc2738b Merge pull request #18399 from owncloud/api-getusers-for-subadmins 
enable api getUsers for subadmins
 2015-10-20 14:28:31 +02:00
Thomas Müller
474f34eb6b Merge pull request #19636 from owncloud/share_expire_backgroun 
Add backgroundjob to expire link shares
 2015-10-20 14:27:15 +02:00
Thomas Müller
899165113c Merge pull request #19742 from owncloud/shareinfo_performance 
Do not calculate non essential info
 2015-10-20 14:25:36 +02:00
Thomas Müller
1a84c8e9d2 Merge pull request #19884 from owncloud/locking_exception 
catch all exception if table doesn't exists
 2015-10-20 13:44:00 +02:00
Vincent Petry
1e64968ff7 Allow leaving update page when errors occurred 2015-10-20 13:29:44 +02:00
Vincent Petry
06ddd40886 Prevent leaving the DB update page while in progress 2015-10-20 13:28:48 +02:00
Thomas Müller
64dc222ce5 Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-value-to-empty 
Delete cookie instead of emptying value
 2015-10-20 12:47:46 +02:00
Björn Schießle
168c2055ba catch all exception if table doesn't exists 2015-10-20 11:34:08 +02:00
Thomas Müller
adfb33b791 Merge pull request #19838 from owncloud/remove-files-remote.php 
Remove apps/files/appinfo/remote.php - this is no longer used
 2015-10-20 11:31:35 +02:00
Thomas Müller
5752e3b3c0 Merge pull request #19666 from owncloud/fix_13002 
Combine OCS API getUser method code into provisioning_api app
 2015-10-20 11:10:39 +02:00
Thomas Müller
50cb8106dc Merge pull request #19859 from owncloud/fix-long-groupnames 
ellipsize long group names in select2 dropdown, fix #16977
 2015-10-20 11:06:18 +02:00
Thomas Müller
5d9a9e8f3d Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner 
fix filepicker loading spinner
 2015-10-20 11:04:12 +02:00
Thomas Müller
a59ad87db8 Merge pull request #19879 from owncloud/oci-setup-static-to-object 
[OCI setup] remove static logger/config calls
 2015-10-20 09:47:59 +02:00
Morris Jobke
5944b33d56 [OCI setup] remove static logger/config calls 
* logger/config object are already injected - this only uses it
 2015-10-20 08:53:57 +02:00
Morris Jobke
e1c47d6823 use correct class name 2015-10-20 08:18:53 +02:00
Roeland Jago Douma
ec296b0b7d Add backgroundjob to expire link shares 
Simple background job to expire the link shares.

* added unit tests
 2015-10-20 08:18:53 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Christoph Wurst
9778094a25 fix filepicker loading spinner 2015-10-19 23:43:12 +02:00
Lukas Reschke
5588c5f262 Delete cookie instead of emptying value 
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.
 2015-10-19 19:54:12 +02:00
Jörn Friedrich Dreyer
2895c91291 Merge pull request #17641 from owncloud/fix_objectstore_rename 
don't move files in cache twice, fixes renaming for objectstores
 2015-10-19 17:18:57 +02:00
Jörn Friedrich Dreyer
c530c9c322 Merge pull request #19864 from owncloud/fix-objectstore-btrfs-host 
skip btrfs hack for objectstore docker container on btrfs host
 2015-10-19 16:49:35 +02:00
Robin Appelman
9c5337ca3e Merge pull request #19833 from owncloud/fix_view_rmdir 
Removemount expects absolutePath
 2015-10-19 16:22:42 +02:00
Lukas Reschke
3d4e0ba4e7 Merge pull request #19861 from owncloud/fix-streamed-download-of-subfolders-master 
The full name has to be tested if it's a dir
 2015-10-19 15:03:48 +02:00
Morris Jobke
6d3a9bf03a skip btrfs hack for objectstore docker container on btrfs host 2015-10-19 10:32:51 +02:00
Thomas Müller
7fe7655070 The full name has to be tested if it's a dir - fixes #19854 2015-10-19 10:07:33 +02:00
Jenkins for ownCloud
008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jan-Christoph Borchardt
3875ca2d19 ellipsize long group names in select2 dropdown, fix #16977 2015-10-19 16:11:53 +13:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Thomas Müller
2d4c3290e9 Merge pull request #19849 from owncloud/increase-app-versions 
Increase the 2nd digit of shipped apps
 2015-10-17 12:28:05 +02:00
Joas Schilling
0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Thomas Müller
de55f6afbf Fix error in stop script 2015-10-16 21:54:09 +02:00
Thomas Müller
fed3994cdb Fix termination of the ceph docker 2015-10-16 21:41:51 +02:00
Thomas Müller
b04e0deccc Fix termination of the ceph docker 2015-10-16 21:41:51 +02:00
Robin Appelman
d636bce8a4 fix encryption migration test 2015-10-16 21:41:51 +02:00
Robin Appelman
e4364426e2 Fix listing of trash files in test 2015-10-16 21:41:51 +02:00
Robin Appelman
2e8232e803 Fix trashbin handling of unknown/unlimited free space 2015-10-16 21:41:51 +02:00
Robin Appelman
d749b9a5ac Fix rename shared versions test 2015-10-16 21:41:51 +02:00
Robin Appelman
22c5c19376 handle versions expire for home storages with unlimited quota 2015-10-16 21:41:51 +02:00
Robin Appelman
416da0dfe9 fix delete orphan shares test with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
54cea05271 Fix preserving file ids when restoring a file with object storage 2015-10-16 21:41:51 +02:00
Robin Appelman
0c6c36d0c5 fix objectstore files having create permissions 2015-10-16 21:41:51 +02:00
Robin Appelman
a87b34a059 dont assume home storage is local in trash test 2015-10-16 21:41:51 +02:00
Robin Appelman
8efd037eb8 Make shared folder size propagation test work with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
e46741cf5d detect object homestorage in share code 2015-10-16 21:41:51 +02:00