Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ... | Dominik Schürmann | 2015-03-04 | 2 | -2/+203 |
|\ | |||||
| * | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 |
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-03-02 | 1 | -7/+20 |
| |\ | |||||
| * | | supports sub logs in log export | Adithya Abraham Philip | 2015-03-01 | 1 | -68/+55 |
| * | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 2 | -20/+59 |
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 4 | -37/+113 |
| |\ \ | |||||
| * \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 15 | -380/+375 |
| |\ \ \ | |||||
| * | | | | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 |
| * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 24 | -463/+1033 |
| |\ \ \ \ | |||||
| * | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| * | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 41 | -573/+1931 |
| |\ \ \ \ \ | |||||
| * | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+102 |
* | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
* | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 2 | -16/+16 |
* | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 2 | -17/+8 |
* | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 3 | -6/+7 |
* | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -3/+2 |
* | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -7/+1 |
* | | | | | | | ContactHelper cleanup | Dominik Schürmann | 2015-03-04 | 2 | -34/+41 |
* | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst... | Dominik Schürmann | 2015-03-04 | 9 | -119/+129 |
* | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 2 | -13/+9 |
* | | | | | | | Merge pull request #1080 from indrora/avoid-large-log-parcels | Vincent | 2015-03-04 | 1 | -6/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
| * | | | | | | | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 |
* | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain into... | Dominik Schürmann | 2015-03-03 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 |
* | | | | | | | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 |
* | | | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 3 | -44/+47 |
* | | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -24/+25 |
|/ / / / / / / / | |||||
* | | | | | | | | Remove old min sdk check | Dominik Schürmann | 2015-03-03 | 1 | -3/+1 |
* | | | | | | | | Merge pull request #1082 from ishan1604/bug-1081 | Dominik Schürmann | 2015-03-03 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fixes Issue #1081 | Ishan Khanna | 2015-03-03 | 1 | -3/+0 |
* | | | | | | | | Revert "rescale qr code bitmap in background" | Dominik Schürmann | 2015-03-03 | 1 | -6/+7 |
* | | | | | | | | Cleanup of contact sync, debugging | Dominik Schürmann | 2015-03-03 | 2 | -94/+126 |
|/ / / / / / / | |||||
* | | | | | | | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 |
* | | | | | | | 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 |
* | | | | | | 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 |