Georg Ehrke
|
af57996d1e
|
Merge branch 'master' into oc_preview
|
2013-05-25 12:16:25 +02:00 |
|
Georg Ehrke
|
0305ee50c5
|
Merge branch 'master' into oc_preview
|
2013-05-17 11:41:30 +02:00 |
Florin Peter
|
d7dc710c8b
|
revert changes
|
2013-05-17 01:22:30 +02:00 |
Björn Schießle
|
95297c2469
|
add pre-shared hooks
|
2013-05-16 17:44:28 +02:00 |
|
Florin Peter
|
0916769f67
|
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
|
2013-05-15 17:00:01 +02:00 |
|
Florin Peter
|
751487ded7
|
merge changes for files_encryption
|
2013-05-15 10:20:19 +02:00 |
|
Florin Peter
|
226aec8d56
|
Merge branch 'master' into files_encryption
|
2013-05-15 03:22:06 +02:00 |
Michael Gapczynski
|
73d7cae6df
|
One more mount point fix
|
2013-05-02 18:22:43 -04:00 |
Robin Appelman
|
809b5f81f6
|
Further seperation of mount management logic
|
2013-04-26 00:01:36 +02:00 |
Sam Tuke
|
4aa80d02be
|
Merge branch 'master' into files_encryption
|
2013-04-23 14:13:40 +02:00 |
|
Georg Ehrke
|
ec3e97f28f
|
Merge branch 'master' into oc_preview
|
2013-04-22 16:19:16 +02:00 |
|
Björn Schießle
|
b5cb5dab51
|
fix encryption to owncloud user for public link shares
|
2013-04-22 14:30:10 +02:00 |
|
Björn Schießle
|
b24a673714
|
the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared
|
2013-04-22 14:12:18 +02:00 |
|
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 |
|
Michael Gapczynski
|
d51a94161e
|
Initialize collectionTypes variable as false
|
2013-04-08 17:46:52 -04:00 |
|
Michael Gapczynski
|
e704bcd96e
|
Correct undefined variable in post_shared hook, fixes #2592
|
2013-04-07 20:05:54 -04: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 |
itheiss
|
568c256aff
|
Fix #2499
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.
e.g. 'mail_domain' => 'example.com'
|
2013-03-22 10:07:06 +01:00 |
Frank Karlitschek
|
3cb016d478
|
add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
|
2013-03-19 14:27:02 +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 |
Thomas Mueller
|
6019cdd5bd
|
adding test case for getDefaultEmailAddress() + fixing #1844 again
|
2013-03-04 21:10:18 +01:00 |
|
Thomas Mueller
|
6c304fa5c0
|
validate the generated email address and fall back to localhost.localdomain in case it is not valid
fixes #1844
|
2013-03-01 22:24:19 +01: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 |
|
Frank Karlitschek
|
9ee5069f2a
|
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
|
2013-02-25 02:04:12 -08:00 |
Bart Visscher
|
bb75dfc021
|
Whitespace fixes
|
2013-02-22 19:05:36 +01:00 |
|
Björn Schießle
|
d8137fdf66
|
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
|
2013-02-22 16:43:11 +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 |
|
Bart Visscher
|
d3ef967993
|
Fix indentation style
|
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 |
|
Bart Visscher
|
ed1dc3e064
|
Fix files router download links
|
2013-02-08 22:05:13 +01:00 |
|
Thomas Müller
|
1158447499
|
missing comma in sql statement
|
2013-02-08 13:49:26 +01:00 |
|
Frank Karlitschek
|
223f538bb8
|
Merge pull request #1500 from chriskoch/patch-1
Update lib/public/util.php
|
2013-02-06 13:00:10 -08:00 |