Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | 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 'vectorijk-development' into development | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain into... | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 | |
|/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | if needed change name options.templ.json | jiangkai | 2015-03-03 | 2 | -1/+4 | |
| * | | | | | | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 | |
| * | | | | | | | | | | | | delete holo icons | jiangkai | 2015-03-03 | 95 | -0/+0 | |
| * | | | | | | | | | | | | change icon name in layout files | jiangkai | 2015-03-03 | 24 | -40/+40 | |
| * | | | | | | | | | | | | download new material design icons | jiangkai | 2015-03-03 | 125 | -0/+0 | |
| * | | | | | | | | | | | | get more material icon script | jiangkai | 2015-03-03 | 1 | -1/+25 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 | |
* | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev... | Dominik Schürmann | 2015-03-03 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1089 from ishan1604/submodulesfix | Dominik Schürmann | 2015-03-03 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fixed Spacing issue | Ishan Khanna | 2015-03-04 | 1 | -3/+3 | |
| | * | | | | | | | | | | This edit prevents some modules from throwing untracked content warning in git | Ishan Khanna | 2015-03-04 | 1 | -1/+3 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 5 | -63/+93 | |
* | | | | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 2 | -33/+43 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 9 | -9/+8 | |
* | | | | | | | | | | Use spinner DatePicker, not full calendar, also on Android 5 | Dominik Schürmann | 2015-03-03 | 2 | -37/+59 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | 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 | Ishan Khanna | 2015-03-03 | 1 | -3/+0 | |
* | | | | | | | | 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 | |
* | | | | | | | | 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 dev... | Vincent Breitmoser | 2015-03-02 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | 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 dev... | Vincent Breitmoser | 2015-03-02 | 17 | -41/+100 | |
|\| | | | | | | ||||||
| * | | | | | | 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 | |
| * | | | | | | 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 |