Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update patternview lib, remove workaround | Dominik Schürmann | 2015-03-03 | 2 | -13/+11 |
| | |||||
* | 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 | ||||
| * | Fixes Issue #1081 | Ishan Khanna | 2015-03-03 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The App crashed because the Adapter was trying to call a method on a null object. Where was the null object? CheckBox was null because in the Layout file view_key_adv_user_id_item.xml There is no such widget with id = user_id_item_check_box Fix : I removed the two lines which were causing the bug, and now the screen loads perfectly. | ||||
* | | Cleanup settings.gradle | Dominik Schürmann | 2015-03-03 | 1 | -2/+0 |
| | | |||||
* | | Revert "rescale qr code bitmap in background" | Dominik Schürmann | 2015-03-03 | 1 | -6/+7 |
| | | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864. | ||||
* | | Cleanup of contact sync, debugging | Dominik Schürmann | 2015-03-03 | 2 | -94/+126 |
|/ | |||||
* | Reorder build.gradle | Dominik Schürmann | 2015-03-02 | 1 | -10/+14 |
| | |||||
* | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 |
| | |||||
* | Update API lib | Dominik Schürmann | 2015-03-02 | 1 | -0/+0 |
| | |||||
* | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 2 | -4/+2 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 1 | -0/+4 |
|\ | | | | | | | development | ||||
| * | README: mac os x workaround | Dominik Schürmann | 2015-03-02 | 1 | -0/+4 |
| | | |||||
* | | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 2 | -18/+20 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 17 | -41/+100 |
|\| | | | | | | | development | ||||
| * | Search string simplified | Dominik Schürmann | 2015-03-02 | 1 | -2/+1 |
| | | |||||
| * | Use gradle witness | Dominik Schürmann | 2015-03-02 | 4 | -2/+37 |
| | | |||||
| * | Update readme for build system | Dominik Schürmann | 2015-03-02 | 1 | -7/+5 |
| | | |||||
| * | Re-add black color | Dominik Schürmann | 2015-03-02 | 1 | -0/+2 |
| | | |||||
| * | 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 |
| |/ |/| |