Thomas Müller
cb1051dae4
Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298
...
Calculate the share statuses in js from the OCS Response
2016-02-12 11:12:14 +01:00
Thomas Müller
e99c4d83dc
Merge pull request #22317 from owncloud/fix_invisible_linkshares
...
Do not allow invisible link shares
2016-02-12 11:10:58 +01:00
Roeland Jago Douma
479c458428
The owner and recipient can also be null
...
If we have backend hickups it can be that we are unable to retrive the
owner and recipient user as well. In such cases just return the UID.
2016-02-12 10:45:33 +01:00
Roeland Jago Douma
0a33cdee0c
If the initiator no longer exists return UID
...
It can happen that the share initiator is deleted. Because of the new
resharing behaviour this share then still exists. We just can fetch the
displayname properly.
2016-02-12 10:45:33 +01:00
Jenkins for ownCloud
f8607ac132
[tx-robot] updated from transifex
2016-02-12 01:56:04 -05:00
Thomas Müller
4d24929e05
Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
...
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Roeland Jago Douma
745bfda41f
Fix migration step to avoind invisible shares
2016-02-11 13:29:23 +01:00
Roeland Jago Douma
0284c60c3a
Add tests
2016-02-11 13:29:23 +01:00
Roeland Jago Douma
a823485638
Reload list of shares on directory change
2016-02-11 11:06:26 +01:00
Thomas Müller
06af9b817e
Merge pull request #22281 from owncloud/activity-100-unshare-activities
...
Add translations of unshare activities
2016-02-11 11:01:47 +01:00
Joas Schilling
31c9e047a8
Delete the notification when the owner unshares the remote before the user did anything
2016-02-11 10:41:55 +01:00
Joas Schilling
2263b8b693
Remove the notification if accepting/declining failed because of 404
2016-02-11 10:41:55 +01:00
Jenkins for ownCloud
5165998723
[tx-robot] updated from transifex
2016-02-11 01:55:35 -05:00
Vincent Petry
f79fafcf06
Revert back to non-webdav download link for public URLs
...
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
2016-02-10 19:09:52 +01:00
Joas Schilling
5dc63e34b4
Add translations of unshare activities
2016-02-10 15:42:48 +01:00
Joas Schilling
fa893762a2
Fix oracle by using less quotes
2016-02-10 08:40:45 +01:00
Joas Schilling
75d552b29e
Listen to the notification event to reload the file list
2016-02-10 08:40:45 +01:00
Joas Schilling
65e1e4a202
Mark the accept button as primary
2016-02-10 08:40:45 +01:00
Joas Schilling
c769f5775d
Create the actions with the correct ID
2016-02-10 08:40:45 +01:00
Joas Schilling
31cf3b8288
Make sure the share ID is an integer
2016-02-10 08:40:45 +01:00
Joas Schilling
cb8024ca14
Fix action paths
2016-02-10 08:40:45 +01:00
Joas Schilling
49dd693d8f
Bring the messages inline
2016-02-10 08:40:45 +01:00
Joas Schilling
a4a7cf40a1
Fix the notification API usage
2016-02-10 08:40:45 +01:00
Joas Schilling
3ff88c8c84
Revert "Disable the remote sharing notifications until they work properly"
...
This reverts commit 6bc93c7401
.
Conflicts:
apps/files_sharing/lib/external/manager.php
2016-02-10 08:40:44 +01:00
Robin Appelman
acd8c72d3d
add tests
2016-02-09 15:03:00 +01:00
Roeland Jago Douma
359c62d90e
Fix unit tests
2016-02-09 15:03:00 +01:00
Robin Appelman
f9f2800016
check share permissions in share controller
2016-02-09 15:03:00 +01:00
Roeland Jago Douma
623a0e4637
Example hook check
2016-02-09 10:36:44 +01:00
Roeland Jago Douma
38cbfed476
Fix unit test
2016-02-09 10:20:25 +01:00
Arthur Schiwon
cd68500731
throw hooks when accessing a link share
2016-02-09 00:34:10 +01:00
Thomas Müller
698a6b07a8
Merge pull request #22206 from owncloud/share2_migration_with_federated
...
Update the migration step to include federated shares
2016-02-08 17:58:26 +01:00
Roeland Jago Douma
3c4e511792
Update the migration step to include federated shares
...
Now federated shares will also be updated to the flat
reshare model.
2016-02-08 15:11:48 +01:00
Roeland Jago Douma
a506f9ca3f
Respect not allowing outgoing shares
2016-02-08 11:30:48 +01:00
Roeland Jago Douma
bec1de8a38
Update OCS Share API to use federated share provider
2016-02-08 11:30:48 +01:00
Roeland Jago Douma
ca32778975
Even single shares are returned as array
...
When fetching a single share using ../shares/<ID> we should still return
an array of shares.
Fixes #22189
2016-02-08 10:11:22 +01:00
Thomas Müller
7568c40275
Merge pull request #22159 from owncloud/fix_21678
...
Gracefull handle link shares rename hook
2016-02-05 16:36:04 +01:00
Roeland Jago Douma
f4edfb6dfb
Gracefull handle link shares rename hook
...
Fixes #21678
The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-02-05 13:57:57 +01:00
Lukas Reschke
35e4acbc1f
Use HTTPS instead of HTTP
...
This is now supported by github.io
2016-02-05 13:05:04 +01:00
Roeland Jago Douma
453ea6698d
[Share 2.0] Fix public link sharing
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0
[Share 2.0] Fix OCS endpoint
2016-02-03 19:25:29 +01:00
Thomas Müller
e34ec0a138
Merge pull request #22095 from owncloud/public_link_with_port
...
Public link downloads should work on instance on non default port
2016-02-03 16:06:54 +01:00
Roeland Jago Douma
4bb96a5553
Construct valid URL
2016-02-03 11:29:36 +01:00
Roeland Jago Douma
dc32f49c6e
[Share 2.0] Use GenericShareException
2016-02-02 14:23:45 +01:00
Roeland Jago Douma
4d7130ad31
[Share 2.0] Add exceptions to OCP
2016-02-02 14:07:11 +01:00
Thomas Müller
dfb88612af
Filter contacts from the local system addressbook - remote share with local users is not allowed
2016-02-02 11:24:26 +01:00
Thomas Müller
847b1e3af0
In some cases $contact['CLOUD'] is not an array
2016-02-02 10:56:33 +01:00
Thomas Müller
e60b217156
Merge pull request #22015 from owncloud/share-no-permissions
...
Block shares that dont have the correct source permissions
2016-02-02 10:26:06 +01:00
Roeland Jago Douma
a24e7f6558
Add path filter to OCS Share API ?shared_with_me=true
...
This allows all clients to quickly get the share info for a given path.
Instead of returning everything and filtering it then manually on the
client side.
2016-01-29 15:36:23 +01:00
Robin Appelman
e3b5639fc1
Block shares that dont have the correct source permissions
2016-01-29 13:05:53 +01:00
Roeland Jago Douma
6151a0540b
Update the initiator of the share as well in migration
2016-01-28 19:24:23 +01:00
Roeland Jago Douma
b85770d636
Update reshares in batches as not to run out of memory
2016-01-28 19:24:23 +01:00
Björn Schießle
dc8d43575f
upgrade to sharing 2.0, remove hierarchical re-shares
2016-01-28 19:24:23 +01:00
Roeland Jago Douma
2831884e74
Fix OCS unit tests after two share merges
...
* Use getNode
* Return IShare object so typechecking is happy
2016-01-28 13:17:16 +01:00
Thomas Müller
295de6aad7
Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings
...
Share2 ocs fix passing empty strings
2016-01-28 11:58:35 +01:00
Robin Appelman
1369f2c684
cleanup shared cache
2016-01-28 11:46:43 +01:00
Roeland Jago Douma
34e912ab6b
[Share 2.0] Fix interfaces and comments
...
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma
185b9c6edd
[Share 2.0] Move IShare to OCP
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
6957917b20
[Share 2.0] Allow using permissions to update link share
2016-01-27 20:36:36 +01:00
Roeland Jago Douma
f5c45dfe7b
[Share 2.0] Still allow isolated updates
...
Still allow isolated updates of parameters
2016-01-27 20:36:31 +01:00
Roeland Jago Douma
b321ceef60
[Share 2.0] Also handle empty parameter in updateShare
...
* More sanity checks
* More unit tests
2016-01-27 20:34:06 +01:00
Roeland Jago Douma
35a3432793
[Share 2.0] When passing empty strings don't fail
...
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
2016-01-27 20:34:06 +01:00
Thomas Müller
6973718fb8
Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_shares
...
[Share 2.0] Properly handle user deleted group shares
2016-01-27 16:16:06 +01:00
Thomas Müller
1594371c8c
Merge pull request #21741 from owncloud/l10n-improvements
...
Move methods to the factory that are not related to translating, but to guessing/finding the language
2016-01-27 09:37:00 +01:00
Roeland Jago Douma
a4900d721f
[Share 2.0] Properly handle user deleted group shares
...
If a user deletes a group share we create a special share entry. To the
API this is just a normal group share for that user with permissions 0.
But we should not return this.
2016-01-27 09:02:12 +01:00
Joas Schilling
d46cd6a245
Fix tests
2016-01-26 14:02:32 +01:00
Roeland Jago Douma
46045ecc52
[Share 2.0] Add update share
2016-01-26 13:59:58 +01:00
Jenkins for ownCloud
ecf2d178b1
[tx-robot] updated from transifex
2016-01-26 01:56:06 -05:00
Morris Jobke
75e6734ef4
Remove OC_Helper::imagePath and use the proper public interface
2016-01-24 18:04:20 +01:00
Joas Schilling
ee02165005
Move the notification API to public namespace
2016-01-22 10:32:42 +01:00
Roeland Jago Douma
3a582e88e5
Comments from Vincent
2016-01-21 16:06:12 +01:00
Roeland Jago Douma
0a9cd91e1d
[Share 2.0] Add subfiles=x
2016-01-21 15:56:44 +01:00
Roeland Jago Douma
3666c34a19
[Sharing 2.0] Start with getShares
2016-01-21 15:56:44 +01:00
Roeland Jago Douma
18421e7e68
Directly get from the server container
...
* Updated unit tests
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
67f5216160
Do not use deprected activities API
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
9467859e42
Get correct path for activity downloads
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
894a88ca51
[Share 2.0] Make public link work without view
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
8734ebe505
[Share 2.0] Make link share download use share manager
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
717697313b
[Share 2.0] Move tests over the sharemanager
...
Nice side effect... pure unit tests!
2016-01-20 21:12:26 +01:00
Roeland Jago Douma
0ebc92c44a
[Share 2.0] Move showing link share to sharing 2.0
2016-01-20 21:12:26 +01:00
Jenkins for ownCloud
f076bfac32
[tx-robot] updated from transifex
2016-01-20 01:54:54 -05:00
Thomas Müller
e3b6642a91
Merge pull request #21754 from owncloud/ocs_share_api_add_share_owner
...
[Share 2.0] Add share owner information to OCS Share API
2016-01-18 16:57:48 +01:00
Roeland Jago Douma
d33e578665
[Share 2.0] Add share owner information to OCS Share API
2016-01-15 20:21:47 +01:00
Robin Appelman
30d6222e64
handle noopscanner in shared scanner
2016-01-15 15:37:31 +01:00
Robin Appelman
ddbbe1742f
propagate folder size in the same query for write updates
2016-01-15 15:36:52 +01:00
Thomas Müller
6824704699
Merge pull request #21117 from owncloud/owner-file-exists
...
Only return an owner if the file exists + improved getUidAndFilename
2016-01-15 13:31:56 +01:00
Thomas Müller
52040a3f23
Merge pull request #20898 from owncloud/cache-interfaces
...
Public Cache interfaces
2016-01-15 12:02:31 +01:00
Jenkins for ownCloud
cd840f01ae
[tx-robot] updated from transifex
2016-01-15 01:54:57 -05:00
Robin Appelman
a3d50ef49a
add watcher interface
2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422
add scanner interface
2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b
Return a class from cache operations instead of an array
2016-01-14 12:54:42 +01:00
Robin Appelman
5d0451b848
Safe teardowns
2016-01-14 12:54:42 +01:00
Jenkins for ownCloud
205fbcbfa3
[tx-robot] updated from transifex
2016-01-14 01:55:43 -05:00
Roeland Jago Douma
cbd3050f4c
[Share 2.0] Use full share id (providerId:shareId)
...
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.
However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.
When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
2016-01-13 16:35:15 +01:00
Roeland Jago Douma
67b7ebccd1
[Share 2.0] Add share provider factory
...
* Add providers
* Add share manager to server container
* Use share manager from server container
* Properly get the share manager
2016-01-13 16:35:14 +01:00
Roeland Jago Douma
b4de427c1e
[Share 2.0] Allow registering of share providers
...
* Properly register the default share provider
2016-01-13 16:35:07 +01:00
Thomas Müller
a5e46226ef
Merge pull request #21615 from owncloud/shared-islocal
...
implement isLocal for shared storage
2016-01-13 10:34:23 +01:00
Thomas Müller
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
Roeland Jago Douma
be8125b8e2
Add unit tests to make sure we do not lower the search
2016-01-12 10:34:38 +01:00
Roeland Jago Douma
71976a095f
Do not lower the sharee search
...
Fixes #21639
When lowering the remote search it break remotes that have uppercase
letters like foo@example.com/ownCloud/
Backends do the mathcing so they should also make sure that the search
string is converted to the format they require.
2016-01-12 10:05:09 +01:00
Thomas Müller
3ec8789c77
Merge pull request #21628 from owncloud/deprecated_secure_random_funcions
...
Replace deprecated function calls to SecureRandom
2016-01-12 09:12:13 +01:00
Jenkins for ownCloud
44e91bb90a
[tx-robot] updated from transifex
2016-01-12 01:56:33 -05:00
Roeland Jago Douma
98c4951f45
getLowStrengthGenerator does not do anything anymore
2016-01-11 19:59:15 +01:00
Robin Appelman
af1e810607
implement isLocal for shared storage
2016-01-11 13:58:22 +01:00
Robin Appelman
300eb54c87
de-deplicate getUidAndFilename
2016-01-11 11:40:58 +01:00
Jenkins for ownCloud
580deb09f8
[tx-robot] updated from transifex
2016-01-10 01:55:57 -05:00
Jenkins for ownCloud
72b34575df
[tx-robot] updated from transifex
2016-01-09 01:55:50 -05:00
Roeland Jago Douma
17a066c18e
Properly close db cursors
2016-01-08 20:27:01 +01:00
Roeland Jago Douma
629bac22fd
Make sure to respect deleted group shares by user
2016-01-08 20:27:01 +01:00
Roeland Jago Douma
066e3770bb
Make sure that permissions stay in sync for share_type 2
...
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.
When the permission of the group share is updated we used to only
sometimes update the shares for individual users.
* Added intergration tests
2016-01-08 20:27:01 +01:00
Vincent Petry
9b595474af
Fix public page URL JS test
...
Stub the port so it doesn't use the one configured by karma
2016-01-08 13:25:38 +01:00
Thomas Müller
46107f82d4
Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
...
Issue 20218 min max owncloud version warning
2016-01-07 16:51:00 +01:00
Joas Schilling
ae285c0654
Remove deprecated shipped flag from info.xml which has no use anymore
2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e
Add ownCloud min and max version for shipped apps
2016-01-07 15:11:49 +01:00
Thomas Müller
601457d221
Merge pull request #20773 from owncloud/share2.0_create
...
[Sharing 2.0] create share
2016-01-07 14:57:05 +01:00
Vincent Petry
9742e9b113
Add token in webdav download link of public page
2016-01-07 13:37:18 +01:00
Jenkins for ownCloud
27dfa74d89
[tx-robot] updated from transifex
2016-01-07 01:55:48 -05:00
Roeland Jago Douma
26280e1f19
[Sharing 2.0] Add L10N instance to manager for translated errors
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
527b434cd2
[Sharing 2.0] Do not use static function to get numeric storage id
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
0ab227310f
[Sharing 2.0] General exceptions return 403
...
This is the same as the old behaviour
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
38d3a638ed
[Share 2.0] Enable share creation via OCS API
2016-01-06 14:53:43 +01:00
Jenkins for ownCloud
c77917f48c
[tx-robot] updated from transifex
2016-01-06 01:55:16 -05:00
Jenkins for ownCloud
157bb50a39
[tx-robot] updated from transifex
2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
970495a067
[tx-robot] updated from transifex
2015-12-31 01:55:16 -05:00
Jenkins for ownCloud
89584716f8
[tx-robot] updated from transifex
2015-12-28 01:55:10 -05:00
Jenkins for ownCloud
6fe60569f5
[tx-robot] updated from transifex
2015-12-27 01:54:38 -05:00
Jenkins for ownCloud
7080594670
[tx-robot] updated from transifex
2015-12-20 01:55:09 -05:00
Jenkins for ownCloud
d0cb4c9ab3
[tx-robot] updated from transifex
2015-12-19 01:55:14 -05:00
Roeland Jago Douma
b460bde7c6
Removed deprecated OC_Helper::mimeTypeIcon function
2015-12-18 14:00:20 +01:00
Thomas Müller
9e97bef935
Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
...
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00
Morris Jobke
ecdf88e41b
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-17 17:07:48 +01:00
Roeland Jago Douma
1f715289bf
Removed deprecated function OC_User::deleteUser
...
Replaced with proper OCP calls
2015-12-17 16:18:40 +01:00
Roeland Jago Douma
835911bce5
Removed deprecated private OC_User::createUser
...
All function calls are replaced with the recommended (which was already
the body of the function).
2015-12-17 16:18:40 +01:00
Thomas Müller
1285b78086
Merge pull request #21200 from owncloud/files-authorizationheader
...
Use Authorization headers for public webdav in web UI
2015-12-17 15:30:13 +01:00
Jenkins for ownCloud
a7cd8103b5
[tx-robot] updated from transifex
2015-12-17 01:55:09 -05:00
Thomas Müller
1ecda59c24
Merge pull request #21189 from owncloud/fix_21187
...
File shares can't have create permissions
2015-12-15 13:18:22 +01:00
Vincent Petry
1d37e7abfc
Fixed JS unit tests for fed owner display name
2015-12-14 18:00:35 +01:00
Vincent Petry
ab9849e72f
Use Authorization headers for public webdav instead of URL
...
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
2015-12-14 17:42:13 +01:00
Björn Schießle
c4b65170f2
show display name but internally use the user name
2015-12-14 17:25:10 +01:00
Björn Schießle
efc030aa25
don't allow to create a federated share if source and target server are the same
2015-12-14 17:16:14 +01:00
Roeland Jago Douma
843cf906b1
File shares can't have create permissions
...
fixes #21187
2015-12-14 14:03:14 +01:00
Robin Appelman
3d5a7b307f
Add test case for group share propagation
2015-12-10 13:53:50 +01:00
Thomas Müller
54dbe5b8d5
Merge pull request #20989 from owncloud/fix_20769
...
Update parent when moving share into recieved share
2015-12-09 13:07:57 +01:00
Thomas Müller
bc744ff6de
Merge pull request #21038 from owncloud/share-computesharepermissions-notstore
...
Fix (re)share permission checks in a few code paths
2015-12-09 10:04:56 +01:00
Jenkins for ownCloud
dda9525c4b
[tx-robot] updated from transifex
2015-12-09 01:55:14 -05:00
Vincent Petry
6e4006d139
Add reshare permission checks
...
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-08 13:13:26 +01:00
Joas Schilling
5453daab03
More fixes to the docs
2015-12-08 09:11:50 +01:00
Scrutinizer Auto-Fixer
0f1be1b601
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 20:08:20 +00:00
Scrutinizer Auto-Fixer
453e1bf66e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
Roeland Jago Douma
d38949f423
Update parent when moving share into recieved share
...
Fixes #20769
When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-07 16:28:33 +01:00
Scrutinizer Auto-Fixer
97f9213da9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00