Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 2 | -4/+2 |
| | | |||||
| * | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 2 | -18/+20 |
| | | |||||
| * | don't reload qr code for identical fingerprint | Vincent Breitmoser | 2015-03-02 | 1 | -1/+5 |
| | | |||||
| * | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 4 | -115/+143 |
| | | |||||
* | | 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 | ||||
| * | fix a couple lint errors | Vincent Breitmoser | 2015-02-28 | 2 | -4/+5 |
| | | |||||
| * | some changes to qr scan logic | Vincent Breitmoser | 2015-02-28 | 4 | -37/+113 |
| | | |||||
| * | pass through messenger to certify service from ViewKeyActivity | Vincent Breitmoser | 2015-02-28 | 4 | -49/+87 |
| | | | | | | | | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state. | ||||
| * | fab support for all notify types | Vincent Breitmoser | 2015-02-28 | 1 | -23/+29 |
| | | |||||
| * | small Notify cleanup | Vincent Breitmoser | 2015-02-28 | 1 | -24/+2 |
| | | |||||
| * | clean up warnings in KeyListFragment | Vincent Breitmoser | 2015-02-28 | 1 | -32/+10 |
| | | |||||
| * | collapse fab on action selected | Vincent Breitmoser | 2015-02-28 | 1 | -0/+3 |
| | | | | | | | | closes #1057 | ||||
| * | animate FAB to move up and down when a snackbar appears | Vincent Breitmoser | 2015-02-28 | 1 | -11/+10 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 3 | -4/+85 |
| |\ | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | ||||
| | * | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 3 | -5/+85 |
| | | | |||||
| * | | Update from transifex | Dominik Schürmann | 2015-02-28 | 1 | -2/+0 |
| |/ | |||||
| * | Simplify MainActivity | Dominik Schürmann | 2015-02-28 | 2 | -52/+23 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 2 | -5/+32 |
| |\ | | | | | | | | | | development | ||||
| | * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-02-27 | 4 | -172/+9 |
| | |\ | | | | | | | | | | | | | development | ||||
| | * | | slightly longer color fade duration | Vincent Breitmoser | 2015-02-27 | 1 | -3/+3 |
| | | | | |||||
| | * | | transition status color in key view | Vincent Breitmoser | 2015-02-27 | 1 | -3/+30 |
| | | | | |||||
| | * | | hand through result in CertifyFingerprintActivity | Vincent Breitmoser | 2015-02-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -59/+7 |
| | |/ | |/| | |||||
| * | | Enable multi line snackbar option | Dominik Schürmann | 2015-02-27 | 1 | -1/+5 |
| | | | |||||
| * | | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 2 | -167/+0 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 1 | -7/+125 |
| |\| | | | | | | | | | | development | ||||
| | * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 1 | -7/+125 |
| | | | |||||
| * | | Fix status images in user id adapter | Dominik Schürmann | 2015-02-27 | 1 | -4/+4 |
| |/ | |||||
| * | Keybase header text | Dominik Schürmann | 2015-02-27 | 1 | -2/+2 |
| | | |||||
| * | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 4 | -85/+70 |
| | | |||||
| * | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -7/+23 |
| | | |||||
| * | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 3 | -250/+0 |
| | | |||||
| * | Simplify delete key dialog | Dominik Schürmann | 2015-02-27 | 2 | -4/+9 |
| | | |||||
| * | Remove unused BadImportKeyDialogFragment | Dominik Schürmann | 2015-02-27 | 1 | -67/+0 |
| | | |||||
| * | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 3 | -1/+482 |
| |\ | |||||
| | * | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 1 | -1/+1 |
| | | | |||||
| | * | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -0/+1 |
| | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| | * | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 2 | -3/+20 |
| | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
| | * | All keybase proofs now in place | Tim Bray | 2014-11-11 | 1 | -39/+51 |
| | | | |||||
| | * | Fix a no-result corner case, and make verifications clickable | Tim Bray | 2014-11-07 | 1 | -1/+2 |
| | | | |||||
| | * | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 2 | -0/+449 |
| | | | |||||
| * | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-26 | 1 | -4/+5 |
| |\ \ | | | | | | | | | | | | | development | ||||
| | * | | pre-select certification key if only one is available | Vincent Breitmoser | 2015-02-26 | 1 | -4/+5 |
| | | | |