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

30584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
2a9b0aaaa1 Merge pull request #22482 from owncloud/getowner-cache 
cache result for getowner
 2016-02-18 16:45:40 +01:00
Thomas Müller
d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete 
get the actual user instead of a federated cloud id
 2016-02-18 16:44:57 +01:00
Thomas Müller
f9f66a996e Merge pull request #22496 from owncloud/jenkins-22355 
Fix on shared groups assignment.
 2016-02-18 16:44:27 +01:00
Thomas Müller
22541b73c5 Merge pull request #22422 from owncloud/issue-17230-better-promotion-of-app-updates 
Make app updates better visible (part1)
 2016-02-18 16:44:01 +01:00
Thomas Müller
d2f4b4b421 Merge pull request #22489 from owncloud/bump-zipstreamer 
Bump Zipstreamer
 2016-02-18 16:43:36 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00
Thomas Müller
cdb1aea809 Merge pull request #22498 from owncloud/fedshare-testremote-after-404 
Properly trigger testRemote after getting a 404 from remote fed share
 2016-02-18 14:24:55 +01:00
Thomas Müller
99d6a6b230 Merge pull request #22497 from owncloud/fix-redirect-response 
set correct http status code in redirect response
 2016-02-18 14:24:12 +01:00
v1r0x
ec6e8c1ab6 fix unit test 2016-02-18 12:39:19 +01:00
Vincent Petry
e1dbae1467 Properly trigger testRemote after getting a 404 from remote fed share 
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
 2016-02-18 11:57:03 +01:00
v1r0x
534071f4b2 set correct http status code 
Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
 2016-02-18 11:56:09 +01:00
Lukas Reschke
22ce23628b Bump Zipstreamer 2016-02-18 11:27:27 +01:00
Leonardo Diez
04b5956fc8 Fix on shared groups assignment. 2016-02-18 11:22:28 +01:00
Thomas Müller
73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle 
Add index names so Doctrine does not use a too long random string
 2016-02-18 11:18:32 +01:00
Thomas Müller
bba8875fb5 Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares 
OCS Share API should not return invalid shares
 2016-02-18 11:17:41 +01:00
Thomas Müller
9d24de0ceb Merge pull request #22478 from owncloud/external-missing-auth 
dont die when missing an auth backend
 2016-02-18 11:17:19 +01:00
Bjoern Schiessle
8985181305 get the actual user instead of a federated cloud id 
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
 2016-02-18 10:17:00 +01:00
Bjoern Schiessle
ac1c3d27b7 get the actual user instead of a federated cloud id 
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
 2016-02-18 10:16:59 +01:00
Thomas Müller
3a97a0ad7f Merge pull request #22475 from owncloud/fix-js-issues 
Fixes code analysis issues
 2016-02-18 10:14:31 +01:00
Thomas Müller
8798f85e88 Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-other-views 
Show the comments and tags on the share filters
 2016-02-18 10:14:20 +01:00
Thomas Müller
bfd4a9548b Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection 
Fix GDrive mime type detection with encryption
 2016-02-18 10:14:01 +01:00
Joas Schilling
6374472e2e No more static 2016-02-18 10:12:23 +01:00
Thomas Müller
a345c49d12 Merge pull request #22491 from pra85/patch-1 
Fix a typo in Readme
 2016-02-18 09:56:40 +01:00
Joas Schilling
87746e4ae8 Make app updates better visible 2016-02-18 09:55:11 +01:00
Prayag Verma
bf5fe98487 Fix a typo in Readme 
`diffrent` → `different`
 2016-02-18 09:41:55 +05:30
Robin Appelman
f309bc960d cache result for getowner 2016-02-17 19:14:46 +01:00
Robin Appelman
65a283f967 dont die when missing an auth backend 2016-02-17 16:51:40 +01:00
Thomas Müller
4422f9c9ef Merge pull request #22446 from owncloud/3rdparty-adjustment 
Add new patchwork references
 2016-02-17 15:59:14 +01:00
Vincent Petry
ceaefc2c54 Defer quota check in web UI when overwriting shared file 
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.

To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
 2016-02-17 15:38:21 +01:00
Morris Jobke
d55cfb4f89 Fixes code analysis issues 2016-02-17 15:19:42 +01:00
Thomas Müller
9c1248521a Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswell 
Allow license.php for app repos aswell
 2016-02-17 15:09:30 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Thomas Müller
add696b057 Merge pull request #22468 from owncloud/files_external-global 
remove global credentials
 2016-02-17 14:41:30 +01:00
Thomas Müller
904db15f47 Merge pull request #22470 from owncloud/minimum-phpunit-4.4 
Minimum phpunit 4.4
 2016-02-17 14:20:37 +01:00
Thomas Müller
9afa4bf696 Kill no longer used autotest.cmd 2016-02-17 14:02:24 +01:00
Thomas Müller
3c65b898b2 We require minimum PHPUnit 4.4 2016-02-17 14:01:57 +01:00
Roeland Jago Douma
670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma
2aa0b885f6 OCS Share API should not return invalid shares 
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
 2016-02-17 13:55:39 +01:00
Robin Appelman
c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Lukas Reschke
a5a4e6f89f Add new patchwork references 
CI for https://github.com/owncloud/3rdparty/pull/249
 2016-02-17 13:28:30 +01:00
Vincent Petry
8f96ef147f Don't apply quota in stream wrapper for part files 
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
 2016-02-17 11:52:49 +01:00
Vincent Petry
53eff9792f Check the quota on the actual file's storage in dav quota plugin 
Fix quota plugin to use the correct file name when chunking

When chunking, the file name is the compound name, so need to convert it
to the correct final file name before doing the free space check.
This ensures that in the case of shared files, the correct storage is
used for the quota check.
 2016-02-17 11:52:49 +01:00
Thomas Müller
7b0f83b616 Merge pull request #22445 from owncloud/files-client-sendpropfindheaders 
Files DAV client send propfind headers
 2016-02-17 11:32:16 +01:00
Thomas Müller
92e5160003 Merge pull request #22452 from owncloud/fix_22441 
Unlock sharee input field when sharing fails
 2016-02-17 10:59:03 +01:00
Thomas Müller
9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder 
Handles null as return code and uses proper UserFolder in trashbin
 2016-02-17 10:58:31 +01:00
Thomas Müller
774109b762 Merge pull request #22437 from owncloud/fix_14095 
Allow searching for single character users to share with
 2016-02-17 10:58:14 +01:00
Thomas Müller
ff4e040971 Merge pull request #22435 from owncloud/trashbin-hook-nouser 
Don't resize trash when no user
 2016-02-17 10:57:50 +01:00
Thomas Müller
f6dcc9d615 Merge pull request #22419 from owncloud/issue-20663-console-add-user-group-with-shares 
Make sure to init the users Filesystem so we can add group shares
 2016-02-17 10:57:23 +01:00
Thomas Müller
85f02c8d2b Merge pull request #22299 from owncloud/erikpel-css-fix 
App navigation scrolling (Possible fix for #22158)
 2016-02-17 10:52:58 +01:00
Roeland Jago Douma
a9a3947e61 Do not clear sharee input on failed share 2016-02-17 09:21:17 +01:00