| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | 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 | 9 | -109/+215 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 2 | -48/+77 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | 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 | 48 | -77/+749 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -5/+79 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 3 | -22/+116 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 2 | -9/+18 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 2 | -47/+66 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 179 | -908/+1492 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | 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 | 6 | -80/+295 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 3 | -59/+15 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 3 | -9/+41 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 9 | -110/+275 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 5 | -21/+81 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 4 | -7/+5 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 6 | -18/+59 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 54 | -623/+1317 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * | | | | | | | | | | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 2 | -7/+100 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | 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 | 5 | -34/+42 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 8 | -237/+410 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 12 | -105/+178 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 12 | -112/+156 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 598 | -1502/+1234 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | * | | | | | | | | | | | | | small fixes to the matcher | Vincent Breitmoser | 2015-03-05 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixed length identifiers | Vincent Breitmoser | 2015-03-05 | 2 | -7/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 27 | -246/+672 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 21 | -227/+438 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | remove unused bits from projection | Vincent Breitmoser | 2015-03-02 | 1 | -15/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | nonce is 4 bytes | Vincent Breitmoser | 2015-03-02 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 4 | -1/+26 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 25 | -320/+426 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | * | | | | | | | | | | | | | | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 7 | -28/+13 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 1200 | -13898/+27589 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | | | | | small language fix | Vincent Breitmoser | 2015-01-16 | 2 | -15/+19 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | linked id ui work dns/twitter | Vincent Breitmoser | 2015-01-16 | 5 | -14/+19 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | dns resource is parametrized by fqdn, class and type | Vincent Breitmoser | 2015-01-16 | 2 | -5/+34 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | show notification if KeyListActivity is spawned with an EXTRA_RESULT | Vincent Breitmoser | 2015-01-16 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 29 | -206/+178 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | work on dns resource, working (dummy) verification | Vincent Breitmoser | 2015-01-14 | 10 | -79/+686 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | fix ambiguous column name in advanced key info | Vincent Breitmoser | 2015-01-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | involve user attributes in unit tests for merge and canonicalize! | Vincent Breitmoser | 2015-01-14 | 3 | -15/+73 | |
| | | | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |