Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 1 | -0/+10 |
| | |||||
* | 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 |
|\ | | | | | Do not use realpath() on includes. | ||||
| * | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 8 | -76/+76 |
| | | | | | | | | This is possible because we require PHP 5.3 or higher. | ||||
| * | 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 |
| | | | | | | | | | | | | | | If the file does not exist, realpath() returns false and "include false;" produces "Failed opening '' for inclusion" which is a useless error message. 'include' works just fine with symlinks, "./" and "../". | ||||
* | | [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 |
|\ \ | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| * | | don't change the etags if a file gets encrypted/decrypted to avoid that the ↵ | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| | | | | | | | | | | | | sync client downloads all files again | ||||
| * | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 67 | -549/+350 |
| |\| | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| * | | 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 |
| | | | | | | | | | | | | out for the moment | ||||
| * | | use OC\Files\View to read encrypted file, so that it also works with ↵ | Bjoern Schiessle | 2013-07-31 | 1 | -4/+7 |
| | | | | | | | | | | | | external storages | ||||
| * | | this hopefully fixes testRecoveryForUser(), works locally | Bjoern Schiessle | 2013-07-31 | 1 | -7/+10 |
| | | | | | | | | | | | | for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/crypt.php | ||||
| * | | user interface to allow user to decrypt all his files once the encryption ↵ | Björn Schießle | 2013-07-29 | 3 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php | ||||
* | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 12 | -12/+12 |
|\ \ \ | | | | | | | | | Add newlines at the end of files | ||||
| * | | | 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 | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | crypt.php clean up | ||||
| * | | 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 ↵ | Bjoern Schiessle | 2013-08-09 | 2 | -7/+7 |
| |\ \ | | | | | | | | | | | | | encryption_clean_up | ||||
| | * | | 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 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once | ||||
| * | | | use __DIR__ instead of realpath | Bjoern Schiessle | 2013-08-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | provide correct path for require_once | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 3 | -0/+8 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-11 | 9 | -0/+10 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 59 | -80/+179 |
| | | |