aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| | * | small ui nicetiesVincent Breitmoser2015-04-271-5/+5
| | * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+1
| | * | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-10/+18
| | |\ \
| | * | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-251-6/+7
| | * | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-251-0/+4
| | * | | revamp decrypt uiVincent Breitmoser2015-04-241-7/+8
| | * | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-0/+1
| | * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-62/+78
| | |\ \ \
| | * | | | minor ui and wording changesVincent Breitmoser2015-04-091-4/+4
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-25/+13
| | |\ \ \ \
| | * | | | | even more linked id ui workVincent Breitmoser2015-03-291-0/+1
| | * | | | | more (subtle) ui workVincent Breitmoser2015-03-261-8/+8
| | * | | | | some linked id ui fine tuningVincent Breitmoser2015-03-261-1/+9
| | * | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
| | * | | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-4/+8
| | |\ \ \ \ \
| | * | | | | | support github resource (re)Vincent Breitmoser2015-03-241-1/+10
| | * | | | | | support github resource (pa)Vincent Breitmoser2015-03-241-0/+3
| | * | | | | | work on certification uiVincent Breitmoser2015-03-151-6/+10
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-5/+8
| | |\ \ \ \ \ \
| | * | | | | | | work on second step of identity creationVincent Breitmoser2015-03-131-14/+15