summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-301-0/+10
|
* kill zh_CN.GB2312Thomas Müller2013-08-271-6/+0
|
* Merge pull request #4537 from owncloud/no-realpathThomas Müller2013-08-228-76/+76
|\ | | | | Do not use realpath() on includes.
| * Use __DIR__ instead of dirname(__FILE__).Andreas Fischer2013-08-218-76/+76
| | | | | | | | This is possible because we require PHP 5.3 or higher.
| * Also remove other unnecessary realpath() calls.Andreas Fischer2013-08-213-14/+14
| |
| * Do not use realpath() on includes.Andreas Fischer2013-08-218-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 transifexJenkins for ownCloud2013-08-191-0/+2
| |
* | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-1810-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 Schiessle2013-08-181-24/+32
| | | | | | | | | | | | sync client downloads all files again
| * | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1767-549/+350
| |\| | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-151-1/+1
| | |
| * | preserve mtime if file gets encrypted/decryptedBjoern Schiessle2013-08-121-1/+13
| | |
| * | fix array declarationBjoern Schiessle2013-08-121-1/+1
| | |
| * | don't know why it works locally but not on the build server... let's keep it ↵Bjoern Schiessle2013-07-311-0/+3
| | | | | | | | | | | | out for the moment
| * | use OC\Files\View to read encrypted file, so that it also works with ↵Bjoern Schiessle2013-07-311-4/+7
| | | | | | | | | | | | external storages
| * | this hopefully fixes testRecoveryForUser(), works locallyBjoern Schiessle2013-07-311-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 Schiessle2013-07-311-3/+0
| | |
| * | fixing some unit testsBjoern Schiessle2013-07-302-6/+6
| | |
| * | we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | |
| * | handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
| | |
| * | remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0
| | |
| * | adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
| | |
| * | encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124
| | |
| * | only write keyfiles if it was a new file, otherwise nothing changedBjoern Schiessle2013-07-301-38/+45
| | |
| * | use path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | |
| * | improved error handlingBjoern Schiessle2013-07-301-10/+26
| | |
| * | working decrypt files methodBjoern Schiessle2013-07-292-18/+97
| | |
| * | add ajax call to decrypt all filesBjörn Schießle2013-07-291-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ßle2013-07-293-8/+39
| | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php
* | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-1812-12/+12
|\ \ \ | | | | | | | | Add newlines at the end of files
| * | | Add _many_ newlines at the end of fileskondou2013-08-1812-12/+12
| | |/ | |/|
* | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-181-1/+1
|\ \ \ | |/ / |/| | Compare result are already true/false
| * | Compare result are already true/falseBart Visscher2013-08-171-1/+1
| | |
* | | Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-175-445/+50
|\ \ \ | |/ / |/| | crypt.php clean up
| * | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_sealBjoern Schiessle2013-08-121-30/+6
| | |
| * | Merge branch 'encryption_clean_up' of github.com:owncloud/core into ↵Bjoern Schiessle2013-08-092-7/+7
| |\ \ | | | | | | | | | | | | encryption_clean_up
| | * | fixing typos and PHPDocThomas Müller2013-08-082-7/+7
| | | |
| * | | remove old comments, TODos, etc.Bjoern Schiessle2013-08-092-66/+0
| |/ /
| * | remove todo itemBjoern Schiessle2013-08-081-4/+0
| | |
| * | adapt tests to the changes in crypt.phpBjoern Schiessle2013-08-082-244/+31
| | |
| * | make methods private which are not used from outsideBjoern Schiessle2013-08-081-101/+13
| | |
* | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-5/+0
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-161-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-152-0/+3
| | |
* | | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-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 realpathBjoern Schiessle2013-08-141-1/+1
| | | |
| * | | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-133-0/+8
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-119-0/+10
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0959-80/+179
| | |