Robin Appelman
|
5942d5aeac
|
Improve error message if user creation fails during setup
|
2013-04-22 20:32:40 +02:00 |
Florin Peter
|
8ab9433fdf
|
fix wrong file path in proxy
|
2013-04-22 18:54:23 +02:00 |
|
Florin Peter
|
2827004634
|
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
|
2013-04-22 18:51:11 +02:00 |
|
Florin Peter
|
37c7205941
|
fix wrong file path in util
|
2013-04-22 18:50:59 +02:00 |
Jan-Christoph Borchardt
|
c7a17efc01
|
Merge pull request #2983 from owncloud/style-details
Style details
|
2013-04-22 07:12:19 -07:00 |
Björn Schießle
|
a4364a93d0
|
delete all share keys if a file gets deleted
|
2013-04-22 15:29:58 +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
|
b57478fa27
|
fix comment, remove unused variable
|
2013-04-22 14:14:28 +02:00 |
|
Björn Schießle
|
bcb2e87846
|
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
|
2013-04-22 14:13:59 +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
|
1705938848
|
removed some leftover code; use already existing var for path to users file folder
|
2013-04-22 12:32:38 +02:00 |
|
Florin Peter
|
eade87dc79
|
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
|
2013-04-22 12:32:35 +02:00 |
|
Florin Peter
|
f6ac34afea
|
improved handling for getSharingUsersArray
|
2013-04-22 12:25:55 +02:00 |
|
Björn Schießle
|
8a46e809f0
|
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
|
2013-04-22 12:22:07 +02:00 |
|
Björn Schießle
|
8790ceba25
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-04-22 11:59:26 +02:00 |
|
Björn Schießle
|
a2ba3c8a43
|
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
|
2013-04-22 11:58:39 +02:00 |
|
Florin Peter
|
6b47da10be
|
improved rename and file size support
fix missing user_id on write
|
2013-04-22 04:40:49 +02:00 |
Jenkins for ownCloud
|
f6808617b3
|
[tx-robot] updated from transifex
|
2013-04-22 02:00:20 +02:00 |
|
Jenkins for ownCloud
|
e0027ad78b
|
[tx-robot] updated from transifex
|
2013-04-21 02:04:42 +02:00 |
|
FlorinPeter
|
9a0b73070c
|
Merge pull request #2992 from FlorinPeter/files_encryption
fix for trashbin
|
2013-04-20 05:35:29 -07:00 |
|
Jenkins for ownCloud
|
03c7a52bc5
|
[tx-robot] updated from transifex
|
2013-04-20 02:02:09 +02:00 |
Bart Visscher
|
0701d0019b
|
Merge pull request #3020 from owncloud/cleaner-webdav-reason
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
|
2013-04-19 07:56:41 -07:00 |
|
Bart Visscher
|
e1c5b31d65
|
Test if we want a 3rdparty style/script before checking the 3rdparty root
|
2013-04-19 16:09:39 +02:00 |
|
Bart Visscher
|
25e7dc1ec5
|
Merge pull request #3024 from owncloud/file-delete-action
Fix #1164 and fix showing spinner on delete
|
2013-04-19 06:08:09 -07:00 |
|
Bart Visscher
|
802a5a331b
|
Fix displaying spinner on delete
|
2013-04-19 13:46:11 +02:00 |
|
Bart Visscher
|
a21885953f
|
No need to strip slashes, json_decode handles that for us
|
2013-04-19 13:45:40 +02:00 |
|
Björn Schießle
|
12785b93f1
|
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
|
2013-04-19 13:17:08 +02:00 |
|
Bart Visscher
|
7ac49dd52a
|
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
|
2013-04-19 12:44:54 +02:00 |
Thomas Tanghus
|
4ccc9d896a
|
Merge pull request #3010 from owncloud/fix-cookie_path
Don't use empty session.cookie_path, otherwise we get multiple cookies
|
2013-04-19 01:17:35 -07:00 |
Morris Jobke
|
938b12236a
|
modify password clone to password type right on submit to prevent the browser remind the content
|
2013-04-19 10:06:18 +02:00 |
|
Jenkins for ownCloud
|
1ad0c11136
|
[tx-robot] updated from transifex
|
2013-04-19 01:57:39 +02:00 |
kondou
|
7a2be0c5dc
|
Make divider not selectable
Very hacky
|
2013-04-19 00:39:42 +02:00 |
|
Florin Peter
|
0e1970438b
|
fixed incorrect filesize, download via web is now possible
fixed broken file-info
|
2013-04-18 22:34:22 +02:00 |
|
Thomas Tanghus
|
e09c17de5b
|
Added explanation
|
2013-04-18 22:29:50 +02:00 |
|
Bart Visscher
|
e4876c9117
|
Don't use empty session.cookie_path, otherwise we get multiple cookies
|
2013-04-18 21:11:58 +02:00 |
|
Björn Schießle
|
2bd338c49f
|
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
|
2013-04-18 20:02:27 +02:00 |
|
Björn Schießle
|
5a7a64df08
|
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
|
2013-04-18 20:00:45 +02:00 |
|
Björn Schießle
|
935d039860
|
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() (fe58e4b1a6)
|
2013-04-18 17:53:59 +02:00 |
|
Björn Schießle
|
39c717b24c
|
some fixes to the keymanager class to identify the file owner and the owner path correctly.
|
2013-04-18 17:52:27 +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 |
|
Björn Schießle
|
1df36e0c88
|
rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
|
2013-04-18 16:39:00 +02:00 |
|
Björn Schießle
|
40905c8941
|
fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
|
2013-04-18 16:34:23 +02:00 |
|
Björn Schießle
|
7892fddcb9
|
remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles
|
2013-04-18 15:44:57 +02:00 |
|
Björn Schießle
|
bd3024242f
|
always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
|
2013-04-18 15:42:28 +02:00 |
|
kondou
|
79218be1d2
|
Priorize common languages.
|
2013-04-18 15:14:42 +02:00 |
|
Björn Schießle
|
a646a1169f
|
return filename relative to users file dir and not relative to data dir
|
2013-04-18 13:41:21 +02:00 |
|
Thomas Tanghus
|
9facb67fab
|
Let autoloader resolve paths under apps lib directory.
|
2013-04-18 08:30:09 +02:00 |
|
Jenkins for ownCloud
|
cbd8b792d9
|
[tx-robot] updated from transifex
|
2013-04-18 02:09:28 +02:00 |
|
Florin Peter
|
2434739d69
|
fix for trashbin
|
2013-04-18 02:03:03 +02:00 |
Bernhard Posselt
|
739d8eb152
|
Merge pull request #2986 from eMerzh/upgrade_warn
Warn when we do an upgrade
|
2013-04-17 12:43:15 -07:00 |