| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-02 | 1 | -0/+10 |
|\ |
|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 1 | -0/+10 |
* | | error.php no longer needed | Bjoern Schiessle | 2013-09-02 | 1 | -23/+0 |
* | | improved documentation of the methods | Bjoern Schiessle | 2013-09-02 | 2 | -1/+4 |
* | | encryption error messages, distinguish between a re-enabled encryption app an... | Bjoern Schiessle | 2013-09-02 | 8 | -77/+46 |
* | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 7 | -43/+125 |
|/ |
|
* | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -6/+0 |
* | Merge pull request #4537 from owncloud/no-realpath | Thomas Müller | 2013-08-22 | 8 | -76/+76 |
|\ |
|
| * | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 8 | -76/+76 |
| * | Also remove other unnecessary realpath() calls. | Andreas Fischer | 2013-08-21 | 3 | -14/+14 |
| * | Do not use realpath() on includes. | Andreas Fischer | 2013-08-21 | 8 | -62/+62 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 1 | -0/+2 |
* | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 10 | -114/+393 |
|\ \ |
|
| * | | don't change the etags if a file gets encrypted/decrypted to avoid that the s... | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| * | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 67 | -549/+350 |
| |\| |
|
| * | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 |
| * | | preserve mtime if file gets encrypted/decrypted | Bjoern Schiessle | 2013-08-12 | 1 | -1/+13 |
| * | | fix array declaration | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| * | | don't know why it works locally but not on the build server... let's keep it ... | Bjoern Schiessle | 2013-07-31 | 1 | -0/+3 |
| * | | use OC\Files\View to read encrypted file, so that it also works with external... | Bjoern Schiessle | 2013-07-31 | 1 | -4/+7 |
| * | | this hopefully fixes testRecoveryForUser(), works locally | Bjoern Schiessle | 2013-07-31 | 1 | -7/+10 |
| * | | this test works locally, let's see what out build server says... | Bjoern Schiessle | 2013-07-31 | 1 | -3/+0 |
| * | | fixing some unit tests | Bjoern Schiessle | 2013-07-30 | 2 | -6/+6 |
| * | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| * | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 2 | -2/+7 |
| * | | remove unused method, the right one is in util.php | Bjoern Schiessle | 2013-07-30 | 1 | -4/+0 |
| * | | adapt unit tests to the modified stream wrapper | Bjoern Schiessle | 2013-07-30 | 5 | -35/+35 |
| * | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 |
| * | | only write keyfiles if it was a new file, otherwise nothing changed | Bjoern Schiessle | 2013-07-30 | 1 | -38/+45 |
| * | | use path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| * | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -10/+26 |
| * | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 2 | -18/+97 |
| * | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 1 | -0/+4 |
| * | | user interface to allow user to decrypt all his files once the encryption app... | Björn Schießle | 2013-07-29 | 3 | -8/+39 |
* | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 12 | -12/+12 |
|\ \ \ |
|
| * | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 12 | -12/+12 |
| | |/
| |/| |
|
* | | | Merge pull request #4483 from owncloud/compare-true-false | Bart Visscher | 2013-08-18 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 1 | -1/+1 |
* | | | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 5 | -445/+50 |
|\ \ \
| |/ /
|/| | |
|
| * | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 |
| * | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryptio... | Bjoern Schiessle | 2013-08-09 | 2 | -7/+7 |
| |\ \ |
|
| | * | | fixing typos and PHPDoc | Thomas Müller | 2013-08-08 | 2 | -7/+7 |
| * | | | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 2 | -66/+0 |
| |/ / |
|
| * | | remove todo item | Bjoern Schiessle | 2013-08-08 | 1 | -4/+0 |
| * | | adapt tests to the changes in crypt.php | Bjoern Schiessle | 2013-08-08 | 2 | -244/+31 |
| * | | make methods private which are not used from outside | Bjoern Schiessle | 2013-08-08 | 1 | -101/+13 |
* | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -5/+0 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 2 | -0/+3 |
* | | | Merge pull request #4393 from owncloud/fix_4326 | Andreas Fischer | 2013-08-14 | 1 | -1/+1 |
|\ \ \ |
|