aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files. I'm sure I'm not the only person who could benefit from this reminder. :)
* | 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
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * 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 ↵Vincent Breitmoser2015-05-288-8/+8
| | | | | | | | PgpDecryptVerify changes
| * 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
| | | | | | | | Fixes #1281
| * 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 ↵Vincent Breitmoser2015-05-288-8/+8
| | | | | | | | PgpDecryptVerify changes
* | 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
| | | | | | | | Fixes #1281
* | 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 ↵Dominik Schürmann2015-05-061-76/+126
| | | | in DecryptTextActivity
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-051-0/+1
|\ | | | | | | development
| * 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 ↵Dominik Schürmann2015-05-041-0/+1
|\ | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-302-2/+0
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2624-226/+237
| |\ | | | | | | | | | into development
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-243-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
* | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:54:17 +0000