aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* add ToolableViewAnimatorVincent Breitmoser2015-06-171-0/+4
* Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-0/+11
|\
| * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-8/+11
| * Improved smart card error handlingJoey Castillo2015-06-101-0/+8
* | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-112-2/+2
|\|
| * Allow debug build besides release buildDominik Schürmann2015-06-102-2/+2
* | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-101-1/+4
|\|
| * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| * Explicit mention of dependency on 3rd party toolStéphane Lavergne2015-06-081-1/+4
* | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-061-0/+1
|/
* Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-031-0/+8
|\
| * implement sticky preferencesVincent Breitmoser2015-05-311-0/+8
* | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-311-0/+1
|/
* 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