Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 1 | -1/+11 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-08 | 1 | -1/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-07 | 1 | -0/+2 |
| | |||||
* | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| | |||||
* | fix part file handling and real size calculation, this should also solve #4581 | Bjoern Schiessle | 2013-09-06 | 3 | -45/+24 |
| | | | | | Conflicts: apps/files_encryption/lib/stream.php | ||||
* | check shares for the real file and not for the .part file | Bjoern Schiessle | 2013-09-06 | 1 | -0/+5 |
| | |||||
* | first check if a extension exists before comparing it | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| | |||||
* | handle part files correctly | Bjoern Schiessle | 2013-09-06 | 1 | -6/+27 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 1 | -0/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 2 | -1/+15 |
| | |||||
* | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| | |||||
* | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 2 | -13/+11 |
| | |||||
* | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 2 | -6/+20 |
| | | | | This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS. | ||||
* | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 2 | -1/+12 |
| | |||||
* | [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 |