Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Remove supertoast dependency | Dominik Schürmann | 2015-03-02 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Removed unused submodules | Dominik Schürmann | 2015-03-02 | 4 | -9/+0 | |
| | | | | | | | ||||||
| * | | | | | | Use SDK and build tools versions from root project | Dominik Schürmann | 2015-03-02 | 10 | -14/+36 | |
| | | | | | | | ||||||
| * | | | | | | Revert "Gradle hack to always use same build tools in subprojects" | Dominik Schürmann | 2015-03-02 | 2 | -32/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fab60f2ddb4917515570f7c60a1be22670cd836e. | |||||
| * | | | | | | Gradle hack to always use same build tools in subprojects | Dominik Schürmann | 2015-03-02 | 2 | -1/+32 | |
| | | | | | | | ||||||
| * | | | | | | 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 | 6 | -122/+162 | |
| | | | | | | ||||||
* | | | | | | 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 | |
| | | | | ||||||
* | | | | Strings: File size | Dominik Schürmann | 2015-02-28 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Fix strings based on transifex reports | Dominik Schürmann | 2015-02-28 | 1 | -13/+13 | |
| | | | | ||||||
* | | | | forgot to commit FabContainer | Vincent Breitmoser | 2015-02-28 | 1 | -0/+8 | |
| | | | | ||||||
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 4 | -6/+89 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -7/+89 | |
| | | | | | ||||||
* | | | | | Update from transifex | Dominik Schürmann | 2015-02-28 | 34 | -238/+1010 | |
|/ / / / | ||||||
* | | | | Simplify MainActivity | Dominik Schürmann | 2015-02-28 | 2 | -52/+23 | |
| | | | | ||||||
* | | | | Upload new keys to keyserver by default | Dominik Schürmann | 2015-02-28 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | padding fixes for key list | Dominik Schürmann | 2015-02-28 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | 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 | 15 | -211/+76 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 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 | 4 | -111/+7 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Enable multi line snackbar option | Dominik Schürmann | 2015-02-27 | 2 | -2/+6 | |
| | | | | | ||||||
* | | | | | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 3 | -208/+27 | |
| | | | | | ||||||
* | | | | | Fix keyboard overlay bug on top of edittexts | Dominik Schürmann | 2015-02-27 | 10 | -5/+47 | |
| | | | | | ||||||
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 5 | -8/+156 | |
|\| | | | | | | | | | | | | | | | | | | | development | |||||
| * | | | | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 5 | -8/+156 | |
| | | | | | ||||||
* | | | | | 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 | 5 | -107/+129 | |
| | | | | ||||||
* | | | | Better qr code resizing | Dominik Schürmann | 2015-02-27 | 6 | -5/+48 | |
| |_|/ |/| | | ||||||
* | | | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 5 | -94/+79 | |
| | | | ||||||
* | | | Prettify qr code cleanup | Dominik Schürmann | 2015-02-27 | 1 | -10/+0 | |
| | | | ||||||
* | | | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -12/+50 | |
| | | | ||||||
* | | | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 5 | -383/+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 | |
| | | | ||||||
* | | | Fix margins of dialog views | Dominik Schürmann | 2015-02-27 | 6 | -21/+30 | |
| | | | ||||||
* | | | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 10 | -11/+987 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 13 | -35/+31 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-04 | 2 | -3/+7 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | keybase-proofs | |||||
| | * | | | | Check fingerprint match between proof & database | Tim Bray | 2014-11-22 | 1 | -0/+1 | |
| | | | | | |