Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 1 | -2/+4 |
| | |||||
* | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 |
| | |||||
* | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 |
| | |||||
* | kill OC::$session | Jörn Friedrich Dreyer | 2014-08-29 | 1 | -11/+11 |
| | | | | | | | | | | | | maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession restore order os OC::$session and OC::$CLI remove unneded initialization of dummy session write back session when $useCustomSession is true log warning when deprecated app is used | ||||
* | Merge pull request #9754 from owncloud/enc_support_aes_256 | Vincent Petry | 2014-08-13 | 1 | -5/+7 |
|\ | | | | | [encryption] support aes 256 | ||||
| * | support aes 256 | Bjoern Schiessle | 2014-07-23 | 1 | -5/+7 |
| | | |||||
* | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 1 | -0/+8 |
|/ | |||||
* | Kill legacy encryption migration | Thomas Müller | 2014-07-08 | 1 | -32/+0 |
| | |||||
* | make sure to enable incognito mode when mounting a public link and update ↵ | Bjoern Schiessle | 2014-06-14 | 1 | -0/+2 |
| | | | | init status of the encryption app | ||||
* | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -10/+10 |
| | | | | * test case added to avoid adding them later | ||||
* | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | |||||
* | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 1 | -2/+2 |
| | |||||
* | @returns -> @return | Thomas Müller | 2014-05-13 | 1 | -4/+4 |
| | |||||
* | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 1 | -1/+1 |
| | |||||
* | close encryption session after decryption was finished | Bjoern Schiessle | 2014-02-26 | 1 | -0/+8 |
| | |||||
* | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 1 | -2/+4 |
|\ | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 1 | -2/+4 |
| | | |||||
* | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -1/+1 |
|/ | |||||
* | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -5/+10 |
| | |||||
* | improved documentation of the methods | Bjoern Schiessle | 2013-09-02 | 1 | -0/+3 |
| | |||||
* | encryption error messages, distinguish between a re-enabled encryption app ↵ | Bjoern Schiessle | 2013-09-02 | 1 | -0/+27 |
| | | | | and a password change from outside | ||||
* | reformat code | Florin Peter | 2013-06-03 | 1 | -6/+7 |
| | |||||
* | introduce decryptPrivateKey() method which also checks if the result is a ↵ | Björn Schießle | 2013-06-03 | 1 | -1/+1 |
| | | | | valid private key to avoid additional checks on various places | ||||
* | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 1 | -14/+10 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | fixed missing convert to new session handler | Florin Peter | 2013-05-28 | 1 | -3/+2 |
| | | |||||
| * | merge master into sessionclass | Robin Appelman | 2013-05-28 | 1 | -10/+38 |
| |\ | |||||
| * | | fix syntax error | Robin Appelman | 2013-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 1 | -13/+7 |
| | | | |||||
* | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 1 | -16/+39 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php | ||||
| * | | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 1 | -13/+38 |
| |/ | |||||
* | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 1 | -1/+1 |
| | | |||||
* | | reformat code | Florin Peter | 2013-05-27 | 1 | -28/+29 |
|/ | |||||
* | fixes after review from @DeepDiver1975 | Florin Peter | 2013-05-23 | 1 | -34/+30 |
| | |||||
* | fix public link share if a user is logged in | Björn Schießle | 2013-05-23 | 1 | -1/+3 |
| | |||||
* | reformat code added and changed phpdoc | Florin Peter | 2013-05-20 | 1 | -82/+85 |
| | |||||
* | update phpdoc | Florin Peter | 2013-05-19 | 1 | -1/+1 |
| | |||||
* | added handling for public file access via files_sharing link | Florin Peter | 2013-05-13 | 1 | -4/+18 |
| | |||||
* | don't create a recovery user, only generate recovery key similar to the ↵ | Björn Schießle | 2013-05-13 | 1 | -8/+2 |
| | | | | public link share key | ||||
* | generate random key name for share key to avoid name conflicts | Björn Schießle | 2013-05-13 | 1 | -19/+26 |
| | |||||
* | Added support for user-specified password for adminRecovery account in admin ↵ | Sam Tuke | 2013-05-04 | 1 | -17/+17 |
| | | | | | | | | | 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 | ||||
* | Fixed recoveryadmin settings in user and admin settings pages (js, ↵ | Sam Tuke | 2013-05-01 | 1 | -6/+12 |
| | | | | | | | | templates, ajax) Renamed recovery methods in Util{} for clarity Added note about bug causing slow page load and redundant keypair generation recoveryAdmin functionality not yet complete | ||||
* | make sure that public-keys dir exists | Björn Schießle | 2013-04-10 | 1 | -1/+7 |
| | |||||
* | Fixed naming bug of public owncloud key dir, which caused new keypair to be ↵ | Sam Tuke | 2013-04-09 | 1 | -7/+19 |
| | | | | generated on each pageload | ||||
* | remove debug output, fix typo in file names | Björn Schießle | 2013-02-14 | 1 | -4/+4 |
| | |||||
* | create keypair for ownCloud with empty passphrase, will be used for public ↵ | Björn Schießle | 2013-02-13 | 1 | -0/+28 |
| | | | | link shares | ||||
* | Fixed comment typo, wrapped return value conditional on var assignment in ↵ | Sam Tuke | 2013-02-05 | 1 | -2/+4 |
| | | | | session{} | ||||
* | Improved support for detecting and recrypting legacy files. Bugs remain. | Sam Tuke | 2013-01-31 | 1 | -1/+1 |
| | |||||
* | Fixed many coding guidelines issues | Sam Tuke | 2013-01-24 | 1 | -6/+41 |
| | | | | | Continued work on upgrade path via login hook listener New spec file with notes | ||||
* | Development snapshot, mocking out Session{} for crypt unit tests | Sam Tuke | 2013-01-02 | 1 | -2/+2 |
| | |||||
* | Revert "Revert "Development snapshot"" | Sam Tuke | 2012-12-11 | 1 | -0/+66 |
| | | | | This reverts commit b66d38ecae3a2e7914520a90c5ef01cbc1432c10. |