Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 5 | -282/+5 |
| | |||||
* | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 4 | -18/+26 |
| | |||||
* | 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 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow | Vincent Breitmoser | 2015-09-01 | 1 | -31/+31 |
| | |||||
* | 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 | 1 | -45/+46 |
| | |||||
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 3 | -2/+174 |
| | |||||
* | add simple StatusIndicator widget | Vincent Breitmoser | 2015-09-01 | 1 | -0/+30 |
| | |||||
* | 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 | 1 | -1/+3 |
| | |||||
* | Show linked identity menu item and linked identities only when feature is ↵ | Dominik Schürmann | 2015-08-29 | 1 | -1/+1 |
| | | | | enabled | ||||
* | Reword experimental settings | Dominik Schürmann | 2015-08-29 | 2 | -4/+7 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 1 | -2/+2 |
|\ | |||||
| * | Improve decrypt strings | Dominik Schürmann | 2015-08-28 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 53 | -14/+1973 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 40 | -288/+404 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | |||||
| * | | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 1 | -6/+6 |
| | | | |||||
| * | | small ui niceties | Vincent Breitmoser | 2015-04-27 | 2 | -6/+6 |
| | | | |||||
| * | | display creation dates for ambiguous user ids | Vincent Breitmoser | 2015-04-27 | 2 | -3/+15 |
| | | | |||||
| * | | add distinct status for messages signed by "your" key | Vincent Breitmoser | 2015-04-27 | 1 | -0/+1 |
| | | | |||||
| * | | small changes for performance | Vincent Breitmoser | 2015-04-27 | 1 | -3/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 3 | -140/+0 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 25 | -43/+273 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml | ||||
| * | | | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 4 | -16/+12 |
| | | | | | |||||
| * | | | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 3 | -4/+14 |
| | | | | | |||||
| * | | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 4 | -81/+44 |
| | | | | | |||||
| * | | | | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 2 | -4/+8 |
| | | | | | |||||
| * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 135 | -1276/+2044 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 2 | -8/+20 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 191 | -7866/+9359 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 3 | -13/+23 |
| | | | | | | | |||||
| * | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 3 | -6/+9 |
| | | | | | | | |||||
| * | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 2 | -30/+27 |
| | | | | | | | |||||
| * | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 16 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 34 | -126/+115 |
| | | | | | | | |||||
| * | | | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 1 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 34 | -176/+222 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | | | | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 4 | -1/+331 |
| | | | | | | | | |||||
| * | | | | | | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 2 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 14 | -33/+71 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 101 | -1504/+1475 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | | | | | | | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 5 | -204/+161 |
| | | | | | | | | | |||||
| * | | | | | | | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 8 | -85/+102 |
| | | | | | | | | | |||||
| * | | | | | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -2/+0 |
| | | | | | | | | |