aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Pull from transifexDominik Schürmann2016-05-1839-98/+641
* Changelog, contributorsDominik Schürmann2016-05-182-0/+10
* shorten pin preference stringVincent Breitmoser2016-05-171-1/+1
* Padding cleanupAndrea Torlaschi2016-05-172-47/+29
* Remove dividersAndrea Torlaschi2016-05-172-15/+0
* Settings: remove unuseful initializationAndrea Torlaschi2016-05-171-0/+1
* Settings: change CheckBoxPreference to SwitchPreferenceAndrea Torlaschi2016-05-172-9/+3
* Revert "Add + button besides TokenAutoComplete, Issue #925"Dominik Schürmann2016-05-121-9/+1
* update progress handling in PgpDecryptVerifyOperationVincent Breitmoser2016-05-111-1/+2
* Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-051-2/+0
* Slight amendments for clarityAlex Fong2016-05-051-1/+1
* Added warning dialog for importing keysAlex Fong2016-05-051-0/+2
* Removed unrequired code, standardized terms used.Alex Fong2016-05-051-1/+1
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-0/+2
* Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-301-3/+3
* Improve security_token_error_iso_dep_not_supportedDominik Schürmann2016-04-301-1/+1
* Fix german title from transifexDominik Schürmann2016-04-301-1/+1
* Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-291-0/+1
|\
| * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+1
* | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-291-2/+2
* | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into Lub...Dominik Schürmann2016-04-291-0/+5
|\ \
| * | unnecesary code removedLubo Viluda2016-04-121-6/+0
| * | Unnecesary code removed and string repairedLubo Viluda2016-04-123-10/+3
| * | upgrade of Redirect import activityLubo Viluda2016-03-243-74/+8
| * | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-204-0/+84
* | | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-291-7/+7
* | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain in...Dominik Schürmann2016-04-291-1/+9
|\ \ \
| * | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-141-1/+9
| | |/ | |/|
* | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-292-2/+7
|\ \ \
| * | | Handle user input on key creation more generouslyfiaxh2016-04-152-2/+7
* | | | New translations from transifexDominik Schürmann2016-04-2960-660/+2222
* | | | Fix stringsDominik Schürmann2016-04-181-2/+2
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-181-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #1835 from nmikhailov/check_security_tokenDominik Schürmann2016-04-161-0/+1
| |\ \ \ \
| | * | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-161-0/+1
* | | | | | Fix delete_failDominik Schürmann2016-04-181-1/+1
|/ / / / /
* / / / / Fix stringDominik Schürmann2016-04-161-1/+1
|/ / / /
* | | | OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-141-1/+24
* | | | OTG: Add usb device manager prototypeNikita Mikhailov2016-04-141-0/+4
| |/ / |/| |
* | | Fix stringDominik Schürmann2016-04-131-1/+1
* | | Merge branch 'backup-code'Dominik Schürmann2016-04-126-69/+1428
|\ \ \
| * | | Fix in-app help for backup codesDominik Schürmann2016-04-121-1/+1
| * | | Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-125-68/+1427
* | | | Fix stringsDominik Schürmann2016-04-121-3/+3
|/ / /
* | | Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-121-0/+1
|\ \ \
| * | | Handle encrypted files while importing keysAndrea Torlaschi2016-03-271-0/+1
* | | | Add missing keyholder string paramNikita Mikhailov2016-04-111-1/+1
| |/ / |/| |
* | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+1
|\ \ \
| * | | Used a constant instead of magic number for colourVictor Hazali2016-04-041-0/+1
| |/ /
* | | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-041-0/+3
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:34:40 +0000