Björn Schießle
|
fe58e4b1a6
|
we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
|
2013-04-18 17:48:16 +02:00 |
Sam Tuke
|
ff6f52d5ec
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
|
2013-03-28 18:39:12 +01:00 |
Bernhard Posselt
|
1e20067c00
|
Merge pull request #2183 from owncloud/fix-shared-statuses-again
Fix #2080 and fix #2141
|
2013-03-11 02:43:16 -07:00 |
|
Björn Schießle
|
2d00d13a5d
|
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
|
2013-03-08 15:13:00 +01:00 |
Michael Gapczynski
|
6e5e8c6b46
|
Fix #2080 and fix #2141
|
2013-03-07 22:30:12 -05:00 |
|
Michael Gapczynski
|
4826564344
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
|
2013-03-07 17:14:34 -05:00 |
|
Michael Gapczynski
|
a5cab28bea
|
Fix fetching source path of shared files
|
2013-03-07 11:12:59 -05:00 |
|
Michael Gapczynski
|
4dcbaa1d7b
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/appinfo/app.php
|
2013-03-05 21:54:32 -05:00 |
|
Michael Gapczynski
|
ee0c38bb51
|
Fix group post_shared hook
|
2013-03-04 19:43:56 -05:00 |
|
Michael Gapczynski
|
b5989c933f
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
|
2013-02-28 10:39:23 -05:00 |
|
Michael Gapczynski
|
9a2ca0ae64
|
Check resharing setting
|
2013-02-26 13:31:15 -05:00 |
|
Michael Gapczynski
|
8983465210
|
Correct parent folders' ETags for all users with access to a shared file
|
2013-02-26 01:21:48 -05:00 |
Bart Visscher
|
bb75dfc021
|
Whitespace fixes
|
2013-02-22 19:05:36 +01:00 |
|
Björn Schießle
|
40efeb9187
|
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
|
2013-02-22 16:02:27 +01:00 |
|
Bart Visscher
|
ffae6f4b84
|
Style-fix: Breakup long lines
|
2013-02-14 08:38:37 +01:00 |
|
Bart Visscher
|
2d6d0a4ad4
|
Whitespace indent fixes
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
cd35d257bb
|
Fix NoSpaceAfterComma and SpaceBeforeComma
|
2013-02-14 08:36:26 +01:00 |
|
Björn Schießle
|
5005195db0
|
create keypair for ownCloud with empty passphrase, will be used for public link shares
|
2013-02-13 17:57:45 +01:00 |
|
Björn Schießle
|
9356f9a6bf
|
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
|
2013-02-13 17:23:27 +01:00 |
|
Björn Schießle
|
4952dfe956
|
add post_unshare hook, also add public link shares to the list of user with access to a file
|
2013-02-13 14:56:39 +01:00 |
|
Björn Schießle
|
a692264fa4
|
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
|
2013-02-12 17:00:33 +01:00 |
|
Björn Schießle
|
d1bbb30385
|
also find users with access to the file if a folder above the actual file was already shared
|
2013-02-12 16:48:04 +01:00 |
|
Björn Schießle
|
8eef919a75
|
take group shares into account if we retrieve the list a all recipients
|
2013-02-12 12:08:34 +01:00 |
|
Sam Tuke
|
92f06243be
|
Implementing sharing support
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
|
2013-02-11 10:21:23 +00:00 |
|
Sam Tuke
|
b3e59ca1e3
|
Work on post_share hook for files_encryption
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
|
2013-02-09 18:39:32 +00:00 |
Thomas Müller
|
1158447499
|
missing comma in sql statement
|
2013-02-08 13:49:26 +01:00 |
|
Björn Schießle
|
9e08f85c5e
|
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
|
2013-02-06 14:19:32 +01:00 |
|
Sam Tuke
|
fd90b82acd
|
Merge github.com:owncloud/core
|
2013-02-05 13:44:45 +00:00 |
|
Thomas Müller
|
3b8c071df4
|
Merge pull request #1234 from owncloud/fix-issue-192
Fix sharing issue with collection and children mismatches
|
2013-02-04 11:52:20 -08:00 |
|
Sam Tuke
|
31e723a907
|
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
|
2013-01-31 16:30:37 +00:00 |
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
|
Björn Schießle
|
a606e8d944
|
use display name to show share_width and owner information
|
2013-01-25 17:40:23 +01:00 |
|
Sam Tuke
|
14d0903a28
|
Merge branch 'master' of github.com:owncloud/core
|
2013-01-23 12:52:53 +00:00 |
|
Michael Gapczynski
|
316eef3ded
|
Fix sharing issue with collection and children mismatches
|
2013-01-19 01:50:02 -05:00 |
|
Michael Gapczynski
|
cd8d8360b0
|
Disable fancy folder sharing for now
|
2013-01-18 23:57:13 -05:00 |
|
Michael Gapczynski
|
5df6f9d14d
|
Fix merge
|
2013-01-18 23:56:47 -05:00 |
|
Robin Appelman
|
5445b94416
|
merge master into filesystem
|
2013-01-16 19:04:50 +01:00 |
|
Bart Visscher
|
5bfe4adbaa
|
Whitespace cleanup
|
2013-01-16 18:09:16 +01:00 |
|
Thomas Mueller
|
388bb6a5e1
|
Merge branch 'master' into fixing-unused-and-undefined-in-master
|
2013-01-14 23:41:34 +01:00 |
|
Sam Tuke
|
de0ed634f2
|
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
|
2013-01-14 17:05:47 +00:00 |
Jörn Friedrich Dreyer
|
42e3eaf45a
|
add more linebreaks, replace SQL LIMIT with param
|
2013-01-09 13:57:51 +01:00 |
|
Michael Gapczynski
|
e8b195bf10
|
Almost fix Shared scanner...
|
2013-01-07 20:52:51 -05:00 |
|
Thomas Mueller
|
cdd28fcc46
|
fixing undefined variable $where
|
2013-01-06 23:48:04 +01:00 |
|
Michael Gapczynski
|
f4e4a06826
|
Forgot to select storage from filecache
|
2013-01-01 12:17:54 -05:00 |
|
Michael Gapczynski
|
cfc3526b25
|
Fix data for shared root folder
|
2012-12-29 11:45:13 -05:00 |
|
Michael Gapczynski
|
1910057900
|
Fix shared statuses inside folders
|
2012-12-26 16:20:10 -05:00 |
|
Michael Gapczynski
|
bf05ff351f
|
Initial support for file sharing with filesystem branch
|
2012-12-15 19:44:59 -05:00 |
|
Robin Appelman
|
d33f697a5f
|
merge master into filesystem
|
2012-11-30 00:18:42 +01:00 |
|
Jörn Friedrich Dreyer
|
eaa625c9bc
|
Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
|
2012-11-28 04:35:52 -08:00 |
|
Jörn Friedrich Dreyer
|
995b5c0739
|
readd fallback code for pre token links
|
2012-11-23 15:51:57 +01:00 |