aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Corrected warning messageVictor Hazali2016-04-011-1/+1
| * | Corrected capitalisation of subkeyVictor Hazali2016-03-301-2/+2
| * | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp...Victor Hazali2016-03-301-0/+3
| |\ \ | | |/ | |/|
| | * Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-021-0/+3
* | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-048-133/+91
|\ \ \
| * | | Redesigned subkey creation dialog and changed default key type created to RSA...Alex Fong2016-04-018-133/+91
* | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-312-2/+6
* | | | Display Key moved to FragmentDurgesh2016-03-292-2/+9
| |/ / |/| |
* | | Final commitAdvaita2016-03-232-0/+7
|/ /
* | Make it a style to reduce code duplicationDominik Schürmann2016-03-086-148/+25
* | Add more responsive text sizesDominik Schürmann2016-03-082-1/+74
* | Using new size qualifiersDominik Schürmann2016-03-084-3/+74
* | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-082-4/+0
* | Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
* | Transifex: pt_BRDominik Schürmann2016-03-0397-291/+2893
* | some changelog for v3.9Vincent Breitmoser2016-03-021-0/+7
|/
* Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-232-6/+15
|\
| * displaytext: add "View Log" option, move "Copy to clipboard" into overflow menuVincent Breitmoser2016-02-222-6/+11
| * mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-221-0/+4
* | Remove AspectRatioImageViewunyoungwax2016-02-231-9/+0
* | Resize QR code properly in landscape orientationunyoungwax2016-02-231-4/+3
|/
* Fix landscape orientationDominik Schürmann2016-02-101-0/+199
* Use non-breaking spaces for backup code MaskedEditTextDominik Schürmann2016-02-102-0/+4
* Backup format v2: redesign restore dialogDominik Schürmann2016-02-101-88/+10
* Backup format v2: redesigned backup code fragment with masked edit textDominik Schürmann2016-02-104-1077/+197
* Better transaction animationTheo Franzén2016-02-1010-203/+167
* Fix EUR symbolDominik Schürmann2016-02-101-8/+8
* Add donation fragmentDominik Schürmann2016-02-091-1/+10
* Remove leftovers from spongycastleDominik Schürmann2016-02-091-1/+1
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-0927-27/+27
* Fix number keypad preferenceDominik Schürmann2016-02-041-1/+1
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-0113-52/+48
* Handle not installed PGP appletTheo Franzén2016-01-151-0/+9
* Lowercase ttl stringsDominik Schürmann2016-01-141-7/+7
* forgot to commit a file to previous commit (thanks travis)Vincent Breitmoser2016-01-131-0/+10
* Pull from transifexDominik Schürmann2016-01-1334-44/+318
* Add facebook key import to changelogDominik Schürmann2016-01-121-0/+1
* Pull from transifexDominik Schürmann2016-01-1125-0/+300