Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 1 | -15/+15 | |
| | | | | ||||||
| * | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-27 | 1 | -309/+396 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php | |||||
| * | | | | remove unused varaibles | Björn Schießle | 2013-05-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | fix for share folder on external storage | Florin Peter | 2013-05-29 | 1 | -1/+19 | |
| | | | | ||||||
* | | | | check list of users with access to the file from the bottom to the top. This ↵ | Björn Schießle | 2013-05-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages | |||||
* | | | | fixed if fopen returns false typically on external storage | Florin Peter | 2013-05-28 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | fix for undefined index | Florin Peter | 2013-05-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 1 | -3/+1 | |
| |/ |/| | ||||||
* | | Merge branch 'master' into file_encryption_util_is_error | Florin Peter | 2013-05-27 | 1 | -27/+12 | |
|\| | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php | |||||
| * | fix first time encryption after app was enabled | Björn Schießle | 2013-05-24 | 1 | -23/+12 | |
| | | ||||||
* | | added check by numRows() | Florin Peter | 2013-05-27 | 1 | -335/+387 | |
| | | | | | | | | | | changed to public api where it was possible reformat code to comply with the coding guidelines | |||||
* | | fixed error rising from fetchRow | Florin Peter | 2013-05-25 | 1 | -22/+27 | |
| | | ||||||
* | | added OC_DB::isError and logging | Florin Peter | 2013-05-25 | 1 | -2/+36 | |
|/ | ||||||
* | fixes after review from @DeepDiver1975 | Florin Peter | 2013-05-23 | 1 | -319/+282 | |
| | ||||||
* | code clean up; nicer solution to solve the public link share problem if a ↵ | Björn Schießle | 2013-05-23 | 1 | -12/+1 | |
| | | | | user is logged in | |||||
* | fix public link share if a user is logged in | Björn Schießle | 2013-05-23 | 1 | -1/+15 | |
| | ||||||
* | fix pgsql error | Florin Peter | 2013-05-22 | 1 | -2/+5 | |
| | ||||||
* | fixed finding encrypted files in subfolders and removed unused code | Florin Peter | 2013-05-22 | 1 | -35/+5 | |
| | ||||||
* | key creation should never override a private or public key | Florin Peter | 2013-05-20 | 1 | -1/+11 | |
| | ||||||
* | reformat code added and changed phpdoc | Florin Peter | 2013-05-20 | 1 | -612/+682 | |
| | ||||||
* | changed database column 'recovery' to 'recovery_enabled' because recovery is ↵ | Florin Peter | 2013-05-19 | 1 | -5/+5 | |
| | | | | | | a pgsql keyword more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html | |||||
* | changed migrationStatus to migration_status for pgsql | Florin Peter | 2013-05-18 | 1 | -3/+3 | |
| | ||||||
* | fix migration to new encryption | Björn Schießle | 2013-05-17 | 1 | -2/+1 | |
| | ||||||
* | some typo fixed | Björn Schießle | 2013-05-17 | 1 | -3/+3 | |
| | ||||||
* | gremove unused code | Björn Schießle | 2013-05-17 | 1 | -54/+59 | |
| | ||||||
* | Merge branch 'files_encryption' of github.com:owncloud/core into ↵ | Björn Schießle | 2013-05-17 | 1 | -2/+2 | |
|\ | | | | | | | files_encryption | |||||
| * | fix for recover files in subfolder | Florin Peter | 2013-05-16 | 1 | -1/+1 | |
| | | ||||||
| * | fix typo in addRecoveryKeys | Florin Peter | 2013-05-16 | 1 | -1/+1 | |
| | | ||||||
* | | upgrade from old encryption to the new one needs to generate share keys too | Björn Schießle | 2013-05-17 | 1 | -6/+9 | |
|/ | ||||||
* | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 1 | -2/+82 | |
| | ||||||
* | fix for re-share and removed check if file exists because we are sometime ↵ | Florin Peter | 2013-05-16 | 1 | -13/+20 | |
| | | | | into a pre_put_contents hook | |||||
* | add recovery key to all files if the user enabled the feature and removes ↵ | Björn Schießle | 2013-05-15 | 1 | -0/+34 | |
| | | | | them again on disable | |||||
* | enable admin to change the recovery password | Björn Schießle | 2013-05-15 | 1 | -0/+28 | |
| | ||||||
* | fix for Allowed memory size of xx bytes exhausted while reading big files | Florin Peter | 2013-05-14 | 1 | -5/+12 | |
| | ||||||
* | fix for public link share | Florin Peter | 2013-05-14 | 1 | -1/+1 | |
| | ||||||
* | added test for public shared file via link | Florin Peter | 2013-05-14 | 1 | -1/+1 | |
| | ||||||
* | added handling for public file access via files_sharing link | Florin Peter | 2013-05-13 | 1 | -51/+93 | |
| | ||||||
* | don't handle public share keys in lib/public/share.php but in ↵ | Björn Schießle | 2013-05-13 | 1 | -1/+8 | |
| | | | | apps/files_encryption/lib/util.php instead | |||||
* | don't create a recovery user, only generate recovery key similar to the ↵ | Björn Schießle | 2013-05-13 | 1 | -2/+2 | |
| | | | | public link share key | |||||
* | generate random key name for share key to avoid name conflicts | Björn Schießle | 2013-05-13 | 1 | -2/+7 | |
| | ||||||
* | fix for webdav | Florin Peter | 2013-05-11 | 1 | -2/+2 | |
| | ||||||
* | Improvements to code formatting & indentation | Sam Tuke | 2013-05-09 | 1 | -109/+114 | |
| | ||||||
* | Implemented initial recoveryAdmin functionality in crypto file proxy | Sam Tuke | 2013-05-09 | 1 | -3/+19 | |
| | ||||||
* | Fixed bugs with pre_share hook usage | Sam Tuke | 2013-05-09 | 1 | -75/+101 | |
| | | | | Made sure new user being shared to is added to array of sharing users | |||||
* | Added pre_share hook | Sam Tuke | 2013-05-08 | 1 | -5/+4 | |
| | | | | | Switched it for post_share hook in encryption hooks Stop a file from being shared if the encryption procedure fails for any users | |||||
* | fix for wrong file infos | Florin Peter | 2013-05-07 | 1 | -3/+4 | |
| | ||||||
* | handling for re-share and re-unshare should work now | Florin Peter | 2013-05-05 | 1 | -2/+46 | |
| | ||||||
* | Added support for user-specified password for adminRecovery account in admin ↵ | Sam Tuke | 2013-05-04 | 1 | -13/+96 | |
| | | | | | | | | | settings page Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB) Made recoveryAdmin user member of 'admin' user group automatically Set recoveryadmin settings to only display on user settings if enabled by an admin Updated encryption db xml schema |