aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #1080 from indrora/avoid-large-log-parcelsVincent2015-03-041-6/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| * | | | | | | | | | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'vectorijk-development' into developmentDominik Schürmann2015-03-03249-44/+71
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain into...Dominik Schürmann2015-03-03249-44/+71
|/| | | | | | | | | |
| * | | | | | | | | | if needed change name options.templ.jsonjiangkai2015-03-032-1/+4
| * | | | | | | | | | icon name changes in UI filesjiangkai2015-03-032-2/+2
| * | | | | | | | | | delete holo iconsjiangkai2015-03-0395-0/+0
| * | | | | | | | | | change icon name in layout filesjiangkai2015-03-0324-40/+40
| * | | | | | | | | | download new material design iconsjiangkai2015-03-03125-0/+0
| * | | | | | | | | | get more material icon scriptjiangkai2015-03-031-1/+25
* | | | | | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
* | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1089 from ishan1604/submodulesfixDominik Schürmann2015-03-031-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | 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 #1081Ishan Khanna2015-03-031-3/+0
* | | | | | | | Cleanup settings.gradleDominik Schürmann2015-03-031-2/+0
* | | | | | | | Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
* | | | | | | | 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 dev...Vincent Breitmoser2015-03-021-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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 dev...Vincent Breitmoser2015-03-0217-41/+100
|\| | | | | |
| * | | | | | 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
| * | | | | | 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