aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* linked: move between fixed statesVincent Breitmoser2015-09-081-10/+56
* statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
* linked: move client id and secret into static vars (build vars later)Vincent Breitmoser2015-09-081-3/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-065-44/+42
|\
| * Use new HashSet<>(Arrays.asList()) instead of staticDominik Schürmann2015-09-041-38/+36
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-034-6/+6
* | linked: clear cookies and don't save form data in oauth webviewVincent Breitmoser2015-09-061-1/+5
* | linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-063-3/+38
* | linked: basic shared element transitionVincent Breitmoser2015-09-067-270/+105
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-022-99/+171
|/
* statusindicator: don't redisplay child with animation if already shownVincent Breitmoser2015-09-011-0/+6
* linked: smooth over progress with tactical pausesVincent Breitmoser2015-09-011-19/+23
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-012-11/+74
* fix missing date in CryptoInputParcel in some cases (could be a bigger problem!)Vincent Breitmoser2015-09-011-1/+3
* linked: work on github designVincent Breitmoser2015-09-012-12/+56
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-014-9/+316
* add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+25
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-312-4/+6
* Show linked identity menu item and linked identities only when feature is ena...Dominik Schürmann2015-08-292-5/+9
* Reword experimental settingsDominik Schürmann2015-08-291-2/+4
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-292-70/+145
|\
| * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-281-51/+3
| * Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie...Dominik Schürmann2015-08-282-61/+188
| |\
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-272-61/+188
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2951-75/+4152
|\ \ \ | |/ / |/| |
| * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| * | fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| * | linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| * | allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
| * | rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
| * | Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-384/+692
| |\ \
| * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-112-2/+3
| * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-098-27/+53
| * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0911-37/+37
| * | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
| * | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| * | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| * | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| * | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
| * | | small ui nicetiesVincent Breitmoser2015-04-274-7/+24
| * | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| * | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
| * | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+13
| * | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| * | | show linked ids card only if unfiltered ids are availableVincent Breitmoser2015-04-261-1/+1
| * | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2627-183/+802
| |\ \ \
| * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-257-17/+53
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-6/+13