| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 50 | -786/+827 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -12/+20 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 29 | -143/+316 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | | * | | | | | | | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 4 | -28/+46 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 3 | -23/+25 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | don't filter tweet intent | Vincent Breitmoser | 2015-03-13 | 1 | -31/+6 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | improve error handling in LinkedIdViewFragment, disable unknown identity ↵ | Vincent Breitmoser | 2015-03-13 | 2 | -8/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types (for now?) | |||||
| | | * | | | | | | | verification takes a second at least | Vincent Breitmoser | 2015-03-13 | 1 | -1/+11 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 1 | -7/+4 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 7 | -30/+10 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | small fix for CreateFinalFragment | Vincent Breitmoser | 2015-03-12 | 2 | -5/+2 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | twitter Step3 -> Step2 | Vincent Breitmoser | 2015-03-12 | 2 | -12/+5 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | ditch custom text step for twitter | Vincent Breitmoser | 2015-03-12 | 3 | -174/+18 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 5 | -46/+43 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -27/+50 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | hack loadSystemContact back in | Vincent Breitmoser | 2015-03-10 | 2 | -5/+13 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 6 | -7/+500 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | |||||
| | | * | | | | | | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 2 | -4/+43 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 2 | -22/+40 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 2 | -9/+18 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -46/+64 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 22 | -354/+687 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | concurrency and continuity fixes for verification backstack handling | Vincent Breitmoser | 2015-03-10 | 1 | -14/+26 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | support backstack for verification | Vincent Breitmoser | 2015-03-09 | 1 | -12/+26 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 3 | -69/+192 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 3 | -9/+41 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 6 | -109/+251 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 4 | -21/+80 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 3 | -5/+3 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 2 | -1/+6 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 14 | -281/+839 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | | * | | | | | | | | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 1 | -6/+90 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | finish after linked id creation | Vincent Breitmoser | 2015-03-06 | 1 | -12/+1 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | use final fragment superclass for twitter | Vincent Breitmoser | 2015-03-06 | 1 | -98/+23 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | use final fragment superclass for dns | Vincent Breitmoser | 2015-03-06 | 2 | -214/+19 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | extract linked id create final fragment superclass | Vincent Breitmoser | 2015-03-06 | 2 | -221/+275 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | prepare superclass extraction for final linked id creation fragment | Vincent Breitmoser | 2015-03-06 | 2 | -30/+38 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 4 | -231/+310 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 3 | -15/+144 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 2 | -78/+48 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 33 | -253/+458 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | | * | | | | | | | | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 11 | -95/+215 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 11 | -30/+213 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | remove unused bits from projection | Vincent Breitmoser | 2015-03-02 | 1 | -15/+1 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 2 | -0/+19 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 5 | -258/+303 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | | * | | | | | | | | | | | | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 4 | -25/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 90 | -3255/+3995 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |