Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -0/+19 |
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 7 | -279/+323 |
|\ | |||||
| * | 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 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Vincent Breitmoser | 2015-03-02 | 1 | -7/+20 |
| |\ | |||||
| | * | Use index constants in ContactHelper | Dominik Schürmann | 2015-03-02 | 1 | -7/+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 | 160 | -5274/+7662 |
|\| | | |||||
| * | | 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 |
| * | 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 |
| * | animate FAB to move up and down when a snackbar appears | Vincent Breitmoser | 2015-02-28 | 1 | -11/+10 |
| * | forgot to commit FabContainer | Vincent Breitmoser | 2015-02-28 | 1 | -0/+8 |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-02-28 | 3 | -4/+85 |
| |\ | |||||
| | * | 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 dev... | Dominik Schürmann | 2015-02-27 | 2 | -5/+32 |
| |\ | |||||
| | * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Vincent Breitmoser | 2015-02-27 | 4 | -172/+9 |
| | |\ | |||||
| | * | | 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 dev... | Dominik Schürmann | 2015-02-27 | 2 | -8/+131 |
| |\| | |||||
| | * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 2 | -8/+131 |
| * | | 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 | 7 | -11/+805 |
| |\ | |||||
| | * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs | Tim Bray | 2014-11-21 | 1 | -2/+1 |
| | |\ \ | |||||
| | | * | | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| | * | | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 2 | -4/+8 |
| | |/ / | |||||
| | * | | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 4 | -9/+13 |
| | * | | Use master key id for keybase proof verification | Dominik Schürmann | 2014-11-22 | 1 | -10/+4 |
| | * | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 4 | -25/+20 |
| | |\ \ | |||||
| | * | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace... | Tim Bray | 2014-11-19 | 2 | -1/+8 |