summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Add _many_ newlines at the end of fileskondou2013-08-1812-12/+12
* Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-175-445/+50
|\
| * 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 encryptio...Bjoern Schiessle2013-08-092-7/+7
| |\
| | * 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
|\ \
| * | 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
* | more error messages which might be useful for the user to debug his server co...Bjoern Schiessle2013-08-082-2/+6
* | improved error message to refect openSSL PHP extension and stock openSSL conf...Bjoern Schiessle2013-08-081-1/+1
* | also write error message to the logBjoern Schiessle2013-08-081-0/+1
* | catch broken server config and disable encryption app.Bjoern Schiessle2013-08-082-1/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-073-16/+17
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-051-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-042-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-08-033-0/+3
|/
* fix test and make warning translatableBjoern Schiessle2013-08-012-3/+9
* cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-9/+6
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-011-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-1/+43
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-283-1/+20
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-271-0/+5
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-232-1/+19
* Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-223-8/+13
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-221-0/+2
| * mark test as incomplete because I can't reproduce jenkins failureMorris Jobke2013-07-211-0/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2013-07-191-8/+8
* | don't rely on admin user but create a test user for Test_Encryption_KeymanagerThomas Müller2013-07-191-17/+15
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-181-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-141-0/+3
* Removed the preview warning. This is only a simple text changeFrank Karlitschek2013-07-131-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-122-1/+22
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-112-1/+35
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-092-0/+5
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-082-3/+7
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-072-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-064-0/+28
* remove wrong closing bracketBjörn Schießle2013-07-051-1/+0
* added helper function to escape glob patternBjörn Schießle2013-07-053-5/+15