Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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: fix button margins in select dialog | Vincent Breitmoser | 2015-09-08 | 1 | -3/+6 |
| | |||||
* | linked: move client id and secret into static vars (build vars later) | Vincent Breitmoser | 2015-09-08 | 1 | -3/+7 |
| | |||||
* | fix unit test for linked ids | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 22 | -54/+52 |
|\ | |||||
| * | Merge pull request #1522 from 0-kaladin/mipmap | Dominik Schürmann | 2015-09-05 | 5 | -0/+0 |
| |\ | | | | | | | Fixes #1520 | ||||
| | * | Fixes #1520 | Kaladin Light | 2015-09-05 | 5 | -0/+0 |
| | | | | | | | | | | | | Move debug launcher icons to mipmap | ||||
| * | | 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 | 16 | -16/+16 |
| | | | | | | | | 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 | 4 | -4/+41 |
| | | |||||
* | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 12 | -552/+110 |
| | | |||||
* | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 7 | -126/+197 |
|/ | |||||
* | linked: fix back button in github dialog | Vincent Breitmoser | 2015-09-01 | 2 | -1/+26 |
| | |||||
* | linked: order selection dialog alphabetically | Vincent Breitmoser | 2015-09-01 | 1 | -25/+20 |
| | |||||
* | 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 | 3 | -42/+105 |
| | |||||
* | fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+3 |
| | |||||
* | linked: use link icon from octo set? not sure yet.. | Vincent Breitmoser | 2015-09-01 | 6 | -1/+1 |
| | |||||
* | linked: update icon design of github l-id creation | Vincent Breitmoser | 2015-09-01 | 11 | -7/+27 |
| | |||||
* | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 3 | -57/+102 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 8 | -12/+501 |
| | |||||
* | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 2 | -0/+55 |
| | |||||
* | linked: Github -> GitHub (fixes #1513) | Vincent Breitmoser | 2015-08-31 | 1 | -9/+9 |
| | |||||
* | linked: fix small typo | Vincent Breitmoser | 2015-08-31 | 1 | -1/+1 |
| | |||||
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 3 | -5/+9 |
| | |||||
* | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 3 | -6/+10 |
| | | | | enabled | ||||
* | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 3 | -6/+11 |
| | |||||
* | move stray test file to correct position | Vincent Breitmoser | 2015-08-29 | 1 | -0/+46 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 4 | -74/+163 |
|\ | |||||
| * | Improve decrypt strings | Dominik Schürmann | 2015-08-28 | 1 | -2/+2 |
| | | |||||
| * | 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 | 3 | -63/+204 |
| |\ | | | | | | | | | | mgeier63-master | ||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 3 | -63/+204 |
| | | | |||||
* | | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 107 | -93/+6133 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 83 | -712/+1410 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -2/+4 |
| | | | | |||||
| * | | | 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 | 12 | -43/+43 |
| | | | | |||||
| * | | | 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 |
| | | | |