aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlinesBjörn Schießle2013-10-112-10/+3
|\
| * fix setting dialog headlines for the encryption appBjoern Schiessle2013-10-112-10/+3
* | fix another typoBjoern Schiessle2013-10-111-1/+1
* | change error code to 403Bjoern Schiessle2013-10-111-1/+1
* | fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
* | block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
|/
* Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-113-30/+3
|\
| * don't cache if the encryption is enabled, this can lead to problems during un...Bjoern Schiessle2013-10-101-27/+1
| * only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-106-3/+21
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-082-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-074-0/+15
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-0625-50/+2
* Merge pull request #4877 from owncloud/ocs_share_apiBjörn Schießle2013-10-041-1/+1
|\
| * check if encryption app is enabled before trying to calculate file sizeBjoern Schiessle2013-09-261-1/+1
* | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617Björn Schießle2013-10-0412-49/+92
|\ \
| * \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-303-5/+8
| |\ \
| * \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-239-12/+114
| |\ \ \
| * \ \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-1613-111/+192
| |\ \ \ \
| * | | | | remove test codeBjoern Schiessle2013-09-061-1/+1
| * | | | | no longer enforce log out, but provide useful errors/warnings insteadBjoern Schiessle2013-09-068-47/+26
| * | | | | re-added error.phpBjoern Schiessle2013-09-061-0/+33
| * | | | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-021-0/+10
| |\ \ \ \ \
| * | | | | | error.php no longer neededBjoern Schiessle2013-09-021-23/+0
| * | | | | | improved documentation of the methodsBjoern Schiessle2013-09-022-1/+4
| * | | | | | encryption error messages, distinguish between a re-enabled encryption app an...Bjoern Schiessle2013-09-028-77/+46
| * | | | | | improved error messaging, initial commitBjoern Schiessle2013-08-307-43/+125
* | | | | | | Merge pull request #4902 from owncloud/repeat_recovery_passwordBjörn Schießle2013-10-042-27/+39
|\ \ \ \ \ \ \
| * | | | | | | add/remove specific CSS class - not all classesMorris Jobke2013-10-031-2/+2
| * | | | | | | fix license header line breaksMorris Jobke2013-09-271-2/+4
| * | | | | | | remove spacesBjoern Schiessle2013-09-191-1/+1
| * | | | | | | remove debug outputBjoern Schiessle2013-09-181-1/+1
| * | | | | | | let user repeat the recovery key password to prevent typosBjoern Schiessle2013-09-182-27/+37
* | | | | | | | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-301-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | set rememberlogin to false for the encryption appBjoern Schiessle2013-09-261-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-291-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | fix check if app is enabledBjoern Schiessle2013-09-251-4/+3
* | | | | | check if key exists before reading itBjoern Schiessle2013-09-251-1/+4
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-185-0/+93
|/ / / /
* | | | Merge pull request #4708 from owncloud/encryption_fixesBjörn Schießle2013-09-183-18/+26
|\ \ \ \
| * | | | performance improvement, check configuration only if no private key existsBjoern Schiessle2013-09-171-7/+12
| * | | | check if stream wrapper is already registered to avoid warningBjoern Schiessle2013-09-031-1/+3
| * | | | make sure that initial encryption also starts for a fresh installationBjoern Schiessle2013-09-032-11/+12
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-161-1/+2
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-131-1/+23
* | | | Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-121-60/+61
|\ \ \ \
| * | | | more is_resource checks before readdirArthur Schiwon2013-09-051-60/+61
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-101-1/+11
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-1/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-071-0/+2