aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-151-0/+12
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-14242-4270/+5584
|\
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-112-1/+7
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-112-13/+4
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-118-8/+9
| * 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-103-300/+0
| * linked: localization for github creationVincent Breitmoser2015-09-102-20/+31
| * linked: add "retry"Vincent Breitmoser2015-09-086-2/+13
| * linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-0611-9/+9
| |\
| | * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-0311-9/+9
| * | linked: basic shared element transitionVincent Breitmoser2015-09-065-282/+5
| * | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-024-18/+26
| |/
| * linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
| * linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
| * linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
| * linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-016-1/+1
| * linked: update icon design of github l-id creationVincent Breitmoser2015-09-0111-7/+27
| * linked: work on github designVincent Breitmoser2015-09-011-45/+46
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-013-2/+174
| * add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+30
| * linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
| * linked: fix small typoVincent Breitmoser2015-08-311-1/+1
| * linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-1/+3
| * 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-292-4/+7
| * 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-2953-14/+1973
| |\ \ | | |/ | |/|
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-288/+404
| | |\
| | * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| | * | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
| | * | small ui nicetiesVincent Breitmoser2015-04-272-6/+6
| | * | 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
| | * | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| | * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2625-43/+273
| | |\ \ \
| | * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-254-16/+12
| | * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
| | * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| | * | | | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
| | * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-1276/+2044
| | |\ \ \ \
| | * | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-7866/+9359
| | |\ \ \ \ \
| | * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | * | | | | | even more linked id ui workVincent Breitmoser2015-03-293-6/+9