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
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
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
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
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
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
a646a1169f
return filename relative to users file dir and not relative to data dir
2013-04-18 13:41:21 +02:00
6dd8c79461
Development snapshot
...
Working on stream{} write
2013-04-17 17:20:37 +02:00
f89a3604aa
Working on stream{} writing
...
Development snapshot
2013-04-16 18:29:22 +02:00
770dcbf663
Fixed stream{} reading of encrypted files (stream_read())
2013-04-16 14:53:54 +02:00
b4dd6ae36c
Merge pull request #2885 from FlorinPeter/files_encryption
...
fix performance issues
2013-04-16 04:25:59 -07:00
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
854b920787
fix some more paths
2013-04-12 15:18:19 +02:00
02d1f86a53
fix some confusion about paths relative to the files dir and to the data dir
2013-04-12 14:30:02 +02:00
f87229ddaf
fix stream wrapper to make initial encryption work
2013-04-12 14:13:38 +02:00
8f0bbdc5cb
fix performance issues
2013-04-11 22:55:48 +02:00
c3a284569b
make sure that public-keys dir exists
2013-04-10 16:46:02 +02:00
4303d6318e
Session expect OC_FilesystemView()
2013-04-10 15:31:19 +02:00
fff979a590
add $view as parameter for getFileKey() call
2013-04-10 15:14:44 +02:00
98de385b8a
add $view as parameter for session constructor
2013-04-10 15:08:28 +02:00
109fe198c3
Added info about filesystem method access conventions
2013-04-09 19:19:27 +02:00
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
14451bdaf0
Development snapshot;
...
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
3cbfacb439
Merge branch 'master' into files_encryption
2013-03-29 15:59:54 +01:00
86ac30c596
Merge pull request #2516 from kabum/master
...
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
66d7cc4c74
Merge pull request #2584 from mrtorrent/fix_instanceid_format
...
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
8ed9be5408
Merge pull request #2597 from kabum/lesslog
...
Make it possible to show less log entries again
2013-03-29 07:22:43 -07:00
7c0999bd27
Merge pull request #2448 from owncloud/userlist_available_groups
...
User list: Keep array of available groups. Should fix #873
2013-03-29 07:19:09 -07:00
ec980a8a25
Merge pull request #2585 from mrtorrent/fix_install_app_version_check
...
Fix install app version check
2013-03-29 05:38:58 -07:00
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
9ecfd07f23
Added ajax scripts for setting pwd recovery preferences
2013-03-28 18:29:18 +01:00
df31ee5a90
Merge pull request #2575 from owncloud/fixing-1461-master
...
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
866ca51d83
fix typo and remove animation
2013-03-28 16:11:46 +01:00
f19fd30278
convert js call to css rule
2013-03-28 15:43:14 +01:00
df74c0e43a
apply code review hints
2013-03-28 15:02:31 +01:00
7098bcd4b7
[tx-robot] updated from transifex
2013-03-28 00:03:44 +01:00
c51396551d
Whitespaces
2013-03-27 22:55:17 +01:00
3af61a0a7c
Share Dialog: show Displayname instead of internal name
2013-03-27 22:55:05 +01:00
78c694b6ee
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
2013-03-27 19:20:08 +01:00
3d29a82150
Cache: Do not overwrite ETag when file did not change
2013-03-27 19:19:40 +01:00
2a2d409733
Only prepare an SQL statement once.
2013-03-27 19:19:16 +01:00
1d676fb0e6
Add PHPDoc
2013-03-27 19:18:58 +01:00
d9e07ca60a
Adjust to Icewind's fix
2013-03-27 19:18:34 +01:00
1a874b9106
Cache: fix property path for getting legacy etag
2013-03-27 19:18:13 +01:00
19c7d9c3dc
Port Icewind's fix I
2013-03-27 19:17:49 +01:00
588e1547cf
Port OC_Property Table Index
2013-03-27 19:17:20 +01:00
5fc276602a
Change LIMIT in DB query respectively remove where not necessary
2013-03-27 19:13:14 +01:00
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
9d25058905
Performance: prepare queries only once
2013-03-27 19:12:04 +01:00
Björn Schießle
Sam Tuke
Sam Tuke
Florin Peter
Bernhard Posselt
Bart Visscher
Jörn Friedrich Dreyer
Morris Jobke
Jenkins for ownCloud
Arthur Schiwon
Robin Appelman