aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* implement sticky preferencesVincent Breitmoser2015-05-311-0/+8
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-311-0/+1
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-0/+1
* show status indicators in EncryptFragmentVincent Breitmoser2015-05-303-17/+96
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-281-2/+1
|\
| * preserve state in DecryptTextActivityVincent Breitmoser2015-05-281-2/+1
| * fix merge problems (derp)Vincent Breitmoser2015-05-281-16/+0
| * warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
| * don't show allowed key list if no key exists, and some minor PgpDecryptVerify...Vincent Breitmoser2015-05-288-8/+8
| * correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-281-2/+0
| * move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-283-10/+9
| * Improve stringsDominik Schürmann2015-05-282-28/+45
| * Fix language based on feedback from transifexDominik Schürmann2015-05-211-1/+1
| * check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
* | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
* | don't show allowed key list if no key exists, and some minor PgpDecryptVerify...Vincent Breitmoser2015-05-288-8/+8
* | correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-271-2/+0
* | move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-273-10/+9
* | Fix language based on feedback from transifexDominik Schürmann2015-05-211-1/+1
* | Improve stringsDominik Schürmann2015-05-192-33/+34
* | check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
* | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
* | Moving blank smart card messages to strings.xmlJoey Castillo2015-05-131-0/+2
* | Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-131-0/+2
* | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-0/+3
* | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-1213-0/+16
|/
* Version 3.2Dominik Schürmann2015-05-0623-23/+23
* Pull from transifexDominik Schürmann2015-05-0610-141/+163
* Renaming for consisitencyDominik Schürmann2015-05-061-5/+5
* Move error overlay into generalized DecryptFragment, better error handling in...Dominik Schürmann2015-05-061-76/+126
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-051-0/+1
|\
| * Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
* | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
|/
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-041-3/+3
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain into...Dominik Schürmann2015-05-041-0/+1
|\
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-302-2/+0
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2624-226/+237
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-243-0/+3
| |\ \
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-0/+3
* | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
* | | | Fix key creation string and displayDominik Schürmann2015-04-301-2/+3
* | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-302-0/+39
* | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
* | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| |_|/ |/| |
* | | UI fixes for Android < 5Dominik Schürmann2015-04-262-11/+13
* | | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
* | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2614-4/+149
* | | Switch to new support lib version 22.1Dominik Schürmann2015-04-252-2/+2
* | | Update in-app contributor listDominik Schürmann2015-04-251-3/+22