aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | development
| * | | | | | | | | | Merge pull request #1089 from ishan1604/submodulesfixDominik Schürmann2015-03-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Submodulesfix
| | * | | | | | | | | Fixed Spacing issueIshan Khanna2015-03-041-3/+3
| | | | | | | | | | |
| | * | | | | | | | | This edit prevents some modules from throwing untracked content warning in gitIshan Khanna2015-03-041-1/+3
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-035-63/+93
| | | | | | | | | |
* | | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-032-33/+43
|/ / / / / / / / /
* | | | | | | | | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-039-9/+8
| | | | | | | | |
* | | | | | | | | Use spinner DatePicker, not full calendar, also on Android 5Dominik Schürmann2015-03-032-37/+59
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Update patternview lib, remove workaroundDominik Schürmann2015-03-032-13/+11
| | | | | | | |
* | | | | | | | Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
| | | | | | | |
* | | | | | | | Merge pull request #1082 from ishan1604/bug-1081Dominik Schürmann2015-03-031-3/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixes Issue #1081
| * | | | | | | Fixes Issue #1081Ishan Khanna2015-03-031-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.gradleDominik Schürmann2015-03-031-2/+0
| | | | | | | |
* | | | | | | | Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864.
* | | | | | | | Cleanup of contact sync, debuggingDominik Schürmann2015-03-032-94/+126
|/ / / / / / /
* | | | | | | Reorder build.gradleDominik Schürmann2015-03-021-10/+14
| | | | | | |
* | | | | | | rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
| | | | | | |
* | | | | | | Update API libDominik Schürmann2015-03-021-0/+0
| | | | | | |
* | | | | | | forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
| | | | | | |
* | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-021-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | development
| * | | | | | README: mac os x workaroundDominik Schürmann2015-03-021-0/+4
| | | | | | |
* | | | | | | some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| | | | | | |
* | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-0217-41/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | development
| * | | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | | | | | |
| * | | | | | Use gradle witnessDominik Schürmann2015-03-024-2/+37
| | | | | | |
| * | | | | | Update readme for build systemDominik Schürmann2015-03-021-7/+5
| | | | | | |
| * | | | | | Re-add black colorDominik Schürmann2015-03-021-0/+2
| | | | | | |
| * | | | | | Remove supertoast dependencyDominik Schürmann2015-03-021-1/+0
| | | | | | |
| * | | | | | Removed unused submodulesDominik Schürmann2015-03-024-9/+0
| | | | | | |
| * | | | | | Use SDK and build tools versions from root projectDominik Schürmann2015-03-0210-14/+36
| | | | | | |
| * | | | | | Revert "Gradle hack to always use same build tools in subprojects"Dominik Schürmann2015-03-022-32/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fab60f2ddb4917515570f7c60a1be22670cd836e.
| * | | | | | Gradle hack to always use same build tools in subprojectsDominik Schürmann2015-03-022-1/+32
| | | | | | |
| * | | | | | Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
| | |_|_|_|/ | |/| | | |
* | | | | | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| | | | | |
* | | | | | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-026-122/+162
| | | | | |
* | | | | | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
|/ / / / /
* | | | / some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
| |_|_|/ |/| | |
* | | | pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-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 typesVincent Breitmoser2015-02-281-23/+29
| | | |
* | | | small Notify cleanupVincent Breitmoser2015-02-281-24/+2
| | | |
* | | | clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
| | | |
* | | | collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| | | | | | | | | | | | | | | | closes #1057
* | | | animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
| | | |
* | | | Strings: File sizeDominik Schürmann2015-02-281-2/+2
| | | |
* | | | Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| | | |
* | | | forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-284-6/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| * | | | control flow for moving the fab up with snackbarVincent Breitmoser2015-02-284-7/+89
| | | | |
* | | | | Update from transifexDominik Schürmann2015-02-2834-238/+1010
|/ / / /
* | | | Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| | | |