Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | KeyBaseLib response Client | Michal Kepkowski | 2016-04-08 | 1 | -1/+1 |
| | |||||
* | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 1 | -1/+1 |
| | |||||
* | linked: correctly show errors in linked id wizard | Vincent Breitmoser | 2015-12-14 | 1 | -7/+1 |
| | |||||
* | use annotations for android sdk constraints | Vincent Breitmoser | 2015-09-28 | 1 | -4/+1 |
| | |||||
* | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 1 | -4/+2 |
| | |||||
* | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 1 | -0/+1 |
| | |||||
* | linked: improve fragment robustness, save cookies through destroyed fragment | Vincent Breitmoser | 2015-09-10 | 1 | -14/+40 |
| | |||||
* | linked: ditch create dns fragment (for now) | Vincent Breitmoser | 2015-09-10 | 2 | -301/+0 |
| | |||||
* | 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 |
| | |||||
* | linked: move client id and secret into static vars (build vars later) | Vincent Breitmoser | 2015-09-08 | 1 | -3/+7 |
| | |||||
* | 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 | 1 | -0/+35 |
| | |||||
* | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 4 | -245/+46 |
| | |||||
* | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 2 | -99/+171 |
| | |||||
* | 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 |
| | |||||
* | linked: work on github design | Vincent Breitmoser | 2015-09-01 | 1 | -12/+51 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 4 | -9/+316 |
| | |||||
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 1 | -0/+2 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 6 | -147/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | linked-ids: remove debug uri | Vincent Breitmoser | 2015-05-16 | 1 | -1/+1 |
| | |||||
* | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 2 | -6/+6 |
| | |||||
* | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 1 | -1/+1 |
| | |||||
* | linked-ids: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 3 | -3/+4 |
| | |||||
* | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -4/+4 |
| | |||||
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 5 | -13/+13 |
| | |||||
* | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 11 | -96/+92 |
| | |||||
* | small ui niceties | Vincent Breitmoser | 2015-04-27 | 2 | -6/+8 |
| | |||||
* | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 4 | -10/+46 |
| | |||||
* | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 1 | -1/+1 |
| | |||||
* | don't show key spinner for a single entry | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | |||||
* | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 2 | -73/+25 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 2 | -24/+25 |
| | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 2 | -6/+6 |
| | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -22/+17 |
| | |||||
* | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 1 | -8/+21 |
| | |||||
* | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -0/+2 |
| | |||||
* | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 1 | -23/+30 |
| | |||||
* | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -5/+5 |
| | |||||
* | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 6 | -13/+25 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 6 | -16/+16 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 3 | -0/+252 |
| | |||||
* | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -11/+19 |
| |