Florin Peter
|
313631edf6
|
Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts:
apps/files_encryption/hooks/hooks.php
|
2013-05-30 00:45:29 +02:00 |
Florin Peter
|
1202ab9995
|
Merge branch 'master' into file_encryption_external_storage_fixes
|
2013-05-29 19:19:40 +02:00 |
Florin Peter
|
d265264542
|
fix for share folder on external storage
|
2013-05-29 19:11:39 +02:00 |
Björn Schießle
|
b44192f366
|
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
|
2013-05-29 13:10:26 +02:00 |
Florin Peter
|
efd629462e
|
changes after review
|
2013-05-29 12:23:33 +02:00 |
Florin Peter
|
c398fc59ad
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
|
2013-05-29 09:21:00 +02:00 |
Florin Peter
|
71a532fc4d
|
fixed if fopen returns false typically on external storage
|
2013-05-28 20:50:14 +02:00 |
Florin Peter
|
6ae7bde788
|
fixed encryption session namespace to avoid problems
|
2013-05-28 17:04:35 +02:00 |
Florin Peter
|
09b54ccb2b
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
|
2013-05-28 11:00:49 +02:00 |
Florin Peter
|
0041711fe3
|
fix for undefined index
|
2013-05-28 09:36:14 +02:00 |
Florin Peter
|
6f9e425939
|
fix for losing private key while being logged in and accessing a public link
|
2013-05-28 09:27:04 +02:00 |
Florin Peter
|
7224fc98b2
|
replace == with === and replace != with !==
|
2013-05-27 20:44:38 +02:00 |
Florin Peter
|
690bf9b8c4
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-27 17:26:35 +02:00 |
Björn Schießle
|
1a3f7891ea
|
remove unused varaibles
|
2013-05-27 15:31:26 +02:00 |
Florin Peter
|
80433fc4c4
|
Merge branch 'master' into file_encryption_util_is_error
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-27 14:41:53 +02:00 |
Florin Peter
|
89f0c8f39d
|
added check by numRows()
changed to public api where it was possible
reformat code to comply with the coding guidelines
|
2013-05-27 12:41:55 +02:00 |
Florin Peter
|
788c5940f0
|
fixed error rising from fetchRow
|
2013-05-25 23:20:55 +02:00 |
Florin Peter
|
9a6cd89a69
|
added OC_DB::isError and logging
|
2013-05-25 21:33:05 +02:00 |
Björn Schießle
|
5ce4149e75
|
fix first time encryption after app was enabled
|
2013-05-24 17:35:00 +02:00 |
Florin Peter
|
6c8de5ae6d
|
fixes after review from @DeepDiver1975
|
2013-05-23 23:56:31 +02:00 |
Björn Schießle
|
7b07168c46
|
code clean up; nicer solution to solve the public link share problem if a user is logged in
|
2013-05-23 21:18:31 +02:00 |
Björn Schießle
|
a9ebf2aabe
|
fix public link share if a user is logged in
|
2013-05-23 20:30:07 +02:00 |
Florin Peter
|
c6722581f9
|
fix pgsql error
|
2013-05-22 02:02:42 +02:00 |
Florin Peter
|
9ca9a22c6a
|
fixed finding encrypted files in subfolders and removed unused code
|
2013-05-22 00:54:47 +02:00 |
Florin Peter
|
8e0540d0e4
|
key creation should never override a private or public key
|
2013-05-20 21:22:03 +02:00 |
Florin Peter
|
3b850a2524
|
reformat code added and changed phpdoc
|
2013-05-20 01:24:36 +02:00 |
Florin Peter
|
ddda2a1f79
|
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
|
2013-05-19 07:04:31 +02:00 |
Florin Peter
|
681252669a
|
changed migrationStatus to migration_status for pgsql
|
2013-05-18 22:10:00 +02:00 |
Björn Schießle
|
eaa61b8539
|
fix migration to new encryption
|
2013-05-17 17:29:32 +02:00 |
Björn Schießle
|
002445e23d
|
some typo fixed
|
2013-05-17 14:49:54 +02:00 |
Björn Schießle
|
93771f735b
|
gremove unused code
|
2013-05-17 14:13:05 +02:00 |
Björn Schießle
|
0b40c1d08a
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-17 11:20:17 +02:00 |
Björn Schießle
|
ca6a77d39b
|
upgrade from old encryption to the new one needs to generate share keys too
|
2013-05-17 11:15:36 +02:00 |
Florin Peter
|
3793e4d2d6
|
fix for recover files in subfolder
|
2013-05-16 22:57:55 +02:00 |
Florin Peter
|
d40d6aa358
|
fix typo in addRecoveryKeys
|
2013-05-16 22:39:09 +02:00 |
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |
Florin Peter
|
c651950a17
|
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
|
2013-05-16 00:34:45 +02:00 |
Björn Schießle
|
57c0a7ed69
|
add recovery key to all files if the user enabled the feature and removes them again on disable
|
2013-05-15 17:56:45 +02:00 |
Björn Schießle
|
64d94c540a
|
enable admin to change the recovery password
|
2013-05-15 16:12:20 +02:00 |
Florin Peter
|
0a7aa6e8cd
|
fix for Allowed memory size of xx bytes exhausted while reading big files
|
2013-05-14 22:32:39 +02:00 |
Florin Peter
|
517105660d
|
fix for public link share
|
2013-05-14 20:11:07 +02:00 |
Florin Peter
|
81ae4cb5d0
|
added test for public shared file via link
|
2013-05-14 00:00:20 +02:00 |
Florin Peter
|
61ed347d26
|
added handling for public file access via files_sharing link
|
2013-05-13 21:24:59 +02:00 |
Björn Schießle
|
aa3eb6bb5b
|
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
|
2013-05-13 17:40:57 +02:00 |
Björn Schießle
|
517efdf952
|
don't create a recovery user, only generate recovery key similar to the public link share key
|
2013-05-13 17:26:21 +02:00 |
Björn Schießle
|
d1e2e47592
|
generate random key name for share key to avoid name conflicts
|
2013-05-13 15:15:35 +02:00 |
Florin Peter
|
e88595638c
|
fix for webdav
|
2013-05-11 00:23:30 +02:00 |
Sam Tuke
|
92e28839ff
|
Improvements to code formatting & indentation
|
2013-05-09 18:16:59 +02:00 |
Sam Tuke
|
3003dd46d1
|
Implemented initial recoveryAdmin functionality in crypto file proxy
|
2013-05-09 18:09:20 +02:00 |
Sam Tuke
|
101e037529
|
Fixed bugs with pre_share hook usage
Made sure new user being shared to is added to array of sharing users
|
2013-05-09 14:43:06 +02:00 |