Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | linked: ditch create dns fragment (for now) | Vincent Breitmoser | 2015-09-10 | 2 | -301/+0 | |
| | | ||||||
| * | linked: deprecate unused method, for now | Vincent Breitmoser | 2015-09-10 | 1 | -1/+2 | |
| | | ||||||
| * | linked: move github client id and secret into build vars | Vincent Breitmoser | 2015-09-10 | 1 | -8/+5 | |
| | | ||||||
| * | linked: localization for github creation | Vincent Breitmoser | 2015-09-10 | 1 | -19/+16 | |
| | | ||||||
| * | linked: don't need javascript, so we don't enable it | Vincent Breitmoser | 2015-09-10 | 1 | -1/+0 | |
| | | ||||||
| * | linked: fix screwups from last commit, sigh | Vincent Breitmoser | 2015-09-10 | 1 | -9/+17 | |
| | | ||||||
| * | linked: work on github lid creation error handling | Vincent Breitmoser | 2015-09-10 | 1 | -38/+125 | |
| | | ||||||
| * | linked: fix auth token revocation (maybe?) | Vincent Breitmoser | 2015-09-08 | 1 | -1/+5 | |
| | | ||||||
| * | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 1 | -3/+17 | |
| | | ||||||
| * | linked: move between fixed states | Vincent Breitmoser | 2015-09-08 | 1 | -10/+56 | |
| | | ||||||
| * | statusindicator: method to set states by name | Vincent Breitmoser | 2015-09-08 | 1 | -0/+9 | |
| | | ||||||
| * | linked: move client id and secret into static vars (build vars later) | Vincent Breitmoser | 2015-09-08 | 1 | -3/+7 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 5 | -44/+42 | |
| |\ | ||||||
| | * | Use new HashSet<>(Arrays.asList()) instead of static | Dominik Schürmann | 2015-09-04 | 1 | -38/+36 | |
| | | | ||||||
| | * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 4 | -6/+6 | |
| | | | | | | | | | | | | Move launcher icons to mipmap | |||||
| * | | linked: clear cookies and don't save form data in oauth webview | Vincent Breitmoser | 2015-09-06 | 1 | -1/+5 | |
| | | | ||||||
| * | | linked: fix "navigate up" in LinkedIdWizard (imperfect) | Vincent Breitmoser | 2015-09-06 | 3 | -3/+38 | |
| | | | ||||||
| * | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 7 | -270/+105 | |
| | | | ||||||
| * | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 2 | -99/+171 | |
| |/ | ||||||
| * | statusindicator: don't redisplay child with animation if already shown | Vincent Breitmoser | 2015-09-01 | 1 | -0/+6 | |
| | | ||||||
| * | linked: smooth over progress with tactical pauses | Vincent Breitmoser | 2015-09-01 | 1 | -19/+23 | |
| | | ||||||
| * | linked: redesign github resource creation, implement ouath flow | Vincent Breitmoser | 2015-09-01 | 2 | -11/+74 | |
| | | ||||||
| * | fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+3 | |
| | | ||||||
| * | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 2 | -12/+56 | |
| | | ||||||
| * | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 4 | -9/+316 | |
| | | ||||||
| * | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 1 | -0/+25 | |
| | | ||||||
| * | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 2 | -4/+6 | |
| | | ||||||
| * | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 2 | -5/+9 | |
| | | | | | | | | enabled | |||||
| * | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 1 | -2/+4 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 2 | -70/+145 | |
| |\ | ||||||
| | * | Support OpenPGP API v9 | Dominik Schürmann | 2015-08-28 | 1 | -10/+6 | |
| | | | ||||||
| | * | Cleanup OpenPgpService2 code, update openpgp-api lib | Dominik Schürmann | 2015-08-28 | 1 | -51/+3 | |
| | | | ||||||
| | * | Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵ | Dominik Schürmann | 2015-08-28 | 2 | -61/+188 | |
| | |\ | | | | | | | | | | | | | mgeier63-master | |||||
| | | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 2 | -61/+188 | |
| | | | | ||||||
| * | | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 51 | -75/+4152 | |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md | |||||
| | * | | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 2 | -42/+54 | |
| | | | | ||||||
| | * | | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -37/+12 | |
| | | | | ||||||
| | * | | linked-ids: remove debug uri | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | allow linked token without one colon | Vincent Breitmoser | 2015-05-12 | 1 | -3/+2 | |
| | | | | ||||||
| | * | | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 5 | -13/+13 | |
| | | | | ||||||
| | * | | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 40 | -384/+692 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 2 | -2/+3 | |
| | | | | | ||||||
| | * | | | linked-ids: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 8 | -27/+53 | |
| | | | | | ||||||
| | * | | | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 7 | -25/+25 | |
| | | | | | ||||||
| | * | | | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 11 | -37/+37 | |
| | | | | | ||||||
| | * | | | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 22 | -324/+295 | |
| | | | | | ||||||
| | * | | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 | |
| | | | | | ||||||
| | * | | | fix crash when moving focus from EncryptKeyCompletionView with unknown text | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | display unknown keys red rather than orange | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then. | |||||
| | * | | | fix "select all" in key list multi-select | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 | |
| | | | | |