| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 3 | -1/+36 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -1/+2 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 82 | -474/+507 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 2 | -11/+102 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 1 | -52/+0 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -0/+8 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 20 | -75/+110 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * | | | | | | | | | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 1 | -1/+10 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 4 | -6/+100 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 3 | -80/+8 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 2 | -6/+6 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 486 | -950/+370 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -0/+216 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 2 | -1/+30 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 4 | -9/+22 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | * | | | | | | | | | | | | | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 696 | -3375/+8010 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | linked id ui work dns/twitter | Vincent Breitmoser | 2015-01-16 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 9 | -29/+29 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | work on dns resource, working (dummy) verification | Vincent Breitmoser | 2015-01-14 | 4 | -13/+232 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | certification of the first linked identity packet! | Vincent Breitmoser | 2015-01-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | add back button to wizard fragments | Vincent Breitmoser | 2015-01-13 | 6 | -12/+24 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | some work on twitter resource | Vincent Breitmoser | 2015-01-13 | 6 | -14/+627 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | add dns button to linked identity selection | Vincent Breitmoser | 2015-01-12 | 2 | -1/+36 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -1/+16 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 2 | -5/+32 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 7 | -0/+453 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Make keybase an experimental feature | Dominik Schürmann | 2015-08-28 | 6 | -116/+100 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add missing scrim drawable | Dominik Schürmann | 2015-08-28 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | introduce text protection and fix color change after confirm | Dominik Schürmann | 2015-08-28 | 2 | -9/+28 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Remove old comment | Dominik Schürmann | 2015-08-28 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Improve scrolling in key view | Dominik Schürmann | 2015-08-28 | 2 | -5/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Dont show FAB for expired, revoked keys | Dominik Schürmann | 2015-08-28 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Improve certify strings | Dominik Schürmann | 2015-08-28 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Collapsing Toolbar | Dominik Schürmann | 2015-08-28 | 2 | -253/+237 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 3 | -1/+10 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Prettify settings, rename some strings | Dominik Schürmann | 2015-08-27 | 24 | -20/+45 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Use SwitchPreference more often | Dominik Schürmann | 2015-08-27 | 3 | -6/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Experimental features settings reworked | Dominik Schürmann | 2015-08-27 | 3 | -5/+29 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Experimental feature setting | Dominik Schürmann | 2015-08-27 | 3 | -2/+9 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | fix msg_ip_merge_secret | Dominik Schürmann | 2015-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Use CDATA to prevent transifex problems | Dominik Schürmann | 2015-08-26 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Pull from transifex | Dominik Schürmann | 2015-08-26 | 44 | -4229/+965 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Pull from transifex | Dominik Schürmann | 2015-08-25 | 52 | -755/+1178 | |
| | | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |