aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-011-0/+2
|\| |
| * | Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-301-0/+2
* | | import: special treatment for application/pgp-keysVincent Breitmoser2015-09-301-0/+1
* | | enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-301-1/+1
* | | enc-export: add "back" button to fail stateVincent Breitmoser2015-09-291-0/+1
* | | enc-export: localize snackbar stringsVincent Breitmoser2015-09-291-0/+4
* | | enc-export: transifex compatVincent Breitmoser2015-09-291-7/+7
* | | enc-export: localization, and layout compatibilityVincent Breitmoser2015-09-291-0/+7
* | | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ...Vincent Breitmoser2015-09-291-0/+1
* | | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-281-11/+17
|\| |
| * | Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-0/+1
| * | Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-241-0/+1
| * | Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| * | Confirm designDominik Schürmann2015-09-241-3/+5
| * | phrase confirmationDominik Schürmann2015-09-241-5/+5
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-201-4/+6
| |/
| * fix fallback for non-mime dataVincent Breitmoser2015-09-191-1/+1
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-261-5/+0
* | encrypted export WIPVincent Breitmoser2015-09-191-0/+1
|/
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-171-0/+1
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-171-0/+6
* multidcrypt: display k9 download only after decryption failureVincent Breitmoser2015-09-171-1/+1
* Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4jVincent Breitmoser2015-09-171-1/+2
|\
| * Add K-9 Mail warning toastDominik Schürmann2015-09-171-1/+2
* | multidecrypt: use chooser intent on click for everything but text/plain ACTIO...Vincent Breitmoser2015-09-171-0/+1
|/
* fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-161-0/+1
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-161-0/+1
* mime: add logging messagesVincent Breitmoser2015-09-161-13/+13
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-161-0/+1
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-151-0/+12
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-146-66/+205
|\
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-1/+1
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-111-11/+2
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-111-1/+2
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-111-2/+2
| * add support for signed-only data in the backend (#1507)Vincent Breitmoser2015-09-101-0/+1
| * linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-101-10/+0
| * linked: localization for github creationVincent Breitmoser2015-09-101-14/+25
| * linked: basic shared element transitionVincent Breitmoser2015-09-061-10/+2
| * linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-021-5/+4
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-011-0/+1
| * linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
| * linked: fix small typoVincent Breitmoser2015-08-311-1/+1
| * Show linked identity menu item and linked identities only when feature is ena...Dominik Schürmann2015-08-291-1/+1
| * Reword experimental settingsDominik Schürmann2015-08-291-4/+6
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-291-2/+2
| |\
| | * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| * | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-4/+114
| |\ \ | | |/ | |/|
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-13/+13
| | |\
| | * | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6