Lukas Reschke
|
1ee224d8cb
|
Merge pull request #3108 from owncloud/fileactions-order
Files: fix the order fileactions are computed for a file
|
2013-04-24 10:55:38 -07:00 |
Jenkins for ownCloud
|
62b9c88bb9
|
[tx-robot] updated from transifex
|
2013-04-24 18:31:36 +02:00 |
Jenkins for ownCloud
|
88fd3b088d
|
[tx-robot] updated from transifex
|
2013-04-24 17:46:20 +02:00 |
Morris Jobke
|
637dd685db
|
fix wrong shared icon description
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
|
2013-04-24 16:13:17 +02:00 |
Robin Appelman
|
ab7fcebeb3
|
Files: fix the order fileactions are computed for a file
|
2013-04-24 15:26:36 +02:00 |
Jenkins for ownCloud
|
a7b4469b2e
|
[tx-robot] updated from transifex
|
2013-04-24 02:01:20 +02:00 |
Florin Peter
|
f8819f54c2
|
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
|
2013-04-23 19:09:01 +02:00 |
Florin Peter
|
baa6fd639f
|
improved file size handling
|
2013-04-23 19:08:52 +02:00 |
Frank Karlitschek
|
99cb37a6d1
|
Merge pull request #3092 from guruz/external_storage_check_for_curl
External Storage: Check for curl in PHP
|
2013-04-23 09:48:04 -07:00 |
Bart Visscher
|
c357f7b8cd
|
Merge pull request #3082 from owncloud/ldap_confcache_opt
LDAP: reset user/group-config association only after exists-check, may p...
|
2013-04-23 09:44:38 -07:00 |
Sam Tuke
|
b7d8da87d0
|
Development snapshot
working on stream handling (large files) in Util->encryptAll()
|
2013-04-23 18:41:01 +02:00 |
Sam Tuke
|
c6bfc7315b
|
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
.part file paths fixed in stream{}
|
2013-04-23 17:36:35 +02:00 |
Sam Tuke
|
4aa80d02be
|
Merge branch 'master' into files_encryption
|
2013-04-23 14:13:40 +02:00 |
Sam Tuke
|
a1d241783e
|
Updated buglist
|
2013-04-23 14:12:28 +02:00 |
Markus Goetz
|
6141b24d96
|
External Storage: Check for curl in PHP
If no curl is found, disable the storage that needs it.
|
2013-04-23 12:36:30 +02:00 |
Jenkins for ownCloud
|
05ab9d2de7
|
[tx-robot] updated from transifex
|
2013-04-23 02:00:31 +02:00 |
Arthur Schiwon
|
b066c0ff44
|
LDAP: reset user/group-config association only after exists-check, may performance in some cases
|
2013-04-23 01:00:27 +02:00 |
Robin Appelman
|
1507d1ef26
|
Files: Fix XSS when creating dropshadow
|
2013-04-22 21:55:54 +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 |
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
|
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 |
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
|
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 |
Florin Peter
|
0e1970438b
|
fixed incorrect filesize, download via web is now possible
fixed broken file-info
|
2013-04-18 22:34:22 +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
|
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 |
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 |
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 |
Sam Tuke
|
6dd8c79461
|
Development snapshot
Working on stream{} write
|
2013-04-17 17:20:37 +02:00 |
Björn Schießle
|
ddde1b65db
|
adapt free space calculation to the way it is done for the trash bin
|
2013-04-17 10:43:12 +02:00 |
Björn Schießle
|
a3999036f7
|
improved free space calculation if no quota is set, discussed in #2936
|
2013-04-17 10:42:59 +02:00 |
Jenkins for ownCloud
|
37868818ff
|
[tx-robot] updated from transifex
|
2013-04-17 02:29:17 +02:00 |
Sam Tuke
|
f89a3604aa
|
Working on stream{} writing
Development snapshot
|
2013-04-16 18:29:22 +02:00 |
Sam Tuke
|
770dcbf663
|
Fixed stream{} reading of encrypted files (stream_read())
|
2013-04-16 14:53:54 +02:00 |
Sam Tuke
|
b4dd6ae36c
|
Merge pull request #2885 from FlorinPeter/files_encryption
fix performance issues
|
2013-04-16 04:25:59 -07:00 |
Sam Tuke
|
f378a7f572
|
Fixed proxy class handing of read / write files
Various work on other classes
|
2013-04-16 13:22:16 +02:00 |
Jörn Friedrich Dreyer
|
606b672a3d
|
always connect file cache updater hooks first
|
2013-04-16 13:07:55 +02:00 |
Björn Schießle
|
01d203c773
|
add explenation of the expire function to the apps description
|
2013-04-16 12:31:33 +02:00 |
Björn Schießle
|
032c54273c
|
write a info message to the log if a file gets removed from the trash bin automatically
|
2013-04-16 12:31:22 +02:00 |
Jenkins for ownCloud
|
d0b3e8aceb
|
[tx-robot] updated from transifex
|
2013-04-16 02:17:30 +02:00 |
Jenkins for ownCloud
|
e13e4c412f
|
[tx-robot] updated from transifex
|
2013-04-15 02:12:43 +02:00 |
Jenkins for ownCloud
|
7d68cd4040
|
[tx-robot] updated from transifex
|
2013-04-14 02:20:35 +02:00 |
Jenkins for ownCloud
|
19afc216cf
|
[tx-robot] updated from transifex
|
2013-04-13 02:15:54 +02:00 |
Björn Schießle
|
854b920787
|
fix some more paths
|
2013-04-12 15:18:19 +02:00 |
Björn Schießle
|
02d1f86a53
|
fix some confusion about paths relative to the files dir and to the data dir
|
2013-04-12 14:30:02 +02:00 |
Björn Schießle
|
f87229ddaf
|
fix stream wrapper to make initial encryption work
|
2013-04-12 14:13:38 +02:00 |
Jenkins for ownCloud
|
33ee2e2f10
|
[tx-robot] updated from transifex
|
2013-04-12 02:11:02 +02:00 |
Florin Peter
|
8f0bbdc5cb
|
fix performance issues
|
2013-04-11 22:55:48 +02:00 |
Björn Schießle
|
1b3b766244
|
cleanup the trash bin tables in the database after a user was deleted
|
2013-04-11 14:40:06 +02:00 |
Björn Schießle
|
544a46c690
|
remove used space for versions from db is a user was deleted
|
2013-04-11 14:39:56 +02:00 |
Jenkins for ownCloud
|
b02db643d0
|
[tx-robot] updated from transifex
|
2013-04-11 02:10:41 +02:00 |
Björn Schießle
|
c3a284569b
|
make sure that public-keys dir exists
|
2013-04-10 16:46:02 +02:00 |
Björn Schießle
|
4303d6318e
|
Session expect OC_FilesystemView()
|
2013-04-10 15:31:19 +02:00 |
Björn Schießle
|
fff979a590
|
add $view as parameter for getFileKey() call
|
2013-04-10 15:14:44 +02:00 |
Björn Schießle
|
98de385b8a
|
add $view as parameter for session constructor
|
2013-04-10 15:08:28 +02:00 |
Björn Schießle
|
48dabd2c14
|
size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage.
|
2013-04-10 10:09:37 +02:00 |
Björn Schießle
|
16b0855992
|
only add filesize to trashbin size if the file was moved to the trash bin successfully
|
2013-04-10 10:09:22 +02:00 |
Jenkins for ownCloud
|
c06bc81c79
|
[tx-robot] updated from transifex
|
2013-04-10 02:09:39 +02:00 |
Sam Tuke
|
109fe198c3
|
Added info about filesystem method access conventions
|
2013-04-09 19:19:27 +02:00 |
Sam Tuke
|
400cf5beb3
|
Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload
|
2013-04-09 19:11:38 +02:00 |
Jenkins for ownCloud
|
5ef389610f
|
[tx-robot] updated from transifex
|
2013-04-09 02:14:02 +02:00 |
Jenkins for ownCloud
|
ccde0212b1
|
[tx-robot] updated from transifex
|
2013-04-08 02:18:28 +02:00 |
Bart Visscher
|
6d6dfffea7
|
Merge pull request #2279 from owncloud/refactor_upload_js
Refactor upload js
|
2013-04-06 15:44:08 -07:00 |
Bart Visscher
|
248e097f3c
|
Merge pull request #1974 from owncloud/use-rawurlencode
OC6- Just use rawurlencode in files list template
|
2013-04-06 11:55:44 -07:00 |
Bart Visscher
|
797b529da7
|
Merge pull request #2759 from owncloud/fix-2718
Set file perms to 0640 of mount.json - fixes #2718
|
2013-04-06 09:52:22 -07:00 |
Bart Visscher
|
46a552fd56
|
Merge pull request #2738 from Kondou-ger/fix_alert_issues
Fixed things in alert-messages
|
2013-04-06 08:24:43 -07:00 |
kondou
|
de2e546617
|
Translate 'Error' in core
|
2013-04-06 16:52:55 +02:00 |
Lukas Reschke
|
6552996734
|
Set file perms to 0640 of mount.json - fixes #2718
|
2013-04-06 13:21:21 +03:00 |
Jenkins for ownCloud
|
6798b6dc34
|
[tx-robot] updated from transifex
|
2013-04-06 00:05:32 +02:00 |
root
|
74b02db337
|
Fixed things in alert-messages
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
|
2013-04-05 01:56:32 +02:00 |
Jenkins for ownCloud
|
c745bfa821
|
[tx-robot] updated from transifex
|
2013-04-05 00:22:48 +02:00 |
Bart Visscher
|
e824c6cffa
|
Merge pull request #2611 from owncloud/filename-width
Adds a fixed width to the filename to prevent horizontal scroll.
|
2013-04-04 05:32:38 -07:00 |
Jenkins for ownCloud
|
cbece8b12f
|
[tx-robot] updated from transifex
|
2013-04-04 00:06:51 +02:00 |
Bernhard Posselt
|
40627a05a8
|
Merge pull request #2694 from owncloud/fix_2690
Typo, fixes #2690
|
2013-04-03 10:23:34 -07:00 |
Arthur Schiwon
|
d44b649d2a
|
Typo, fixes #2690
|
2013-04-03 17:52:34 +02:00 |
Jenkins for ownCloud
|
10e37e1553
|
[tx-robot] updated from transifex
|
2013-04-03 00:04:02 +02:00 |
Jenkins for ownCloud
|
29d33ff7c2
|
[tx-robot] updated from transifex
|
2013-04-02 00:04:27 +02:00 |
Jan-Christoph Borchardt
|
f8e48955b9
|
Merge pull request #2576 from owncloud/fixing-2125-master
fixes #2125 - the warning is now displayed with a disabled button
|
2013-03-31 09:53:07 -07:00 |