Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ... | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 |
|\ | |||||
| * | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 |
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-03-02 | 17 | -41/+104 |
| |\ | |||||
| * | | supports sub logs in log export | Adithya Abraham Philip | 2015-03-01 | 1 | -68/+55 |
| * | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 3 | -20/+66 |
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 4 | -37/+113 |
| |\ \ | |||||
| * \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 74 | -835/+1672 |
| |\ \ \ | |||||
| * | | | | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 |
| * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ... | Adithya Abraham Philip | 2015-02-28 | 37 | -651/+1303 |
| |\ \ \ \ | |||||
| * | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| * | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 835 | -5627/+14491 |
| |\ \ \ \ \ | |||||
| * | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 7 | -0/+117 |
* | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
* | | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 7 | -16/+3 |
* | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 24 | -56/+70 |
* | | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 222 | -48/+36 |
* | | | | | | | Fix transifex | Dominik Schürmann | 2015-03-04 | 1 | -12/+3 |
* | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 55 | -781/+82 |
* | | | | | | | Update lib list | Dominik Schürmann | 2015-03-04 | 2 | -34/+10 |
* | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 3 | -6/+7 |
* | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 2 | -7/+6 |
* | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 2 | -8/+8 |
* | | | | | | | ContactHelper cleanup | Dominik Schürmann | 2015-03-04 | 2 | -34/+41 |
* | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst... | Dominik Schürmann | 2015-03-04 | 9 | -119/+129 |
* | | | | | | | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
* | | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
* | | | | | | | Merge pull request #1097 from ishan1604/orange-toolbar | Dominik Schürmann | 2015-03-04 | 3 | -2/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 5 | -44/+33 |
| * | | | | | | | Fixes Issue#1088 | Ishan Khanna | 2015-03-04 | 2 | -0/+42 |
| * | | | | | | | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 15 | -65/+79 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed Submodules | Ishan Khanna | 2015-03-04 | 1 | -0/+2 |
* | | | | | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 |
* | | | | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 3 | -17/+13 |
* | | | | | | | | | | 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 |
| | | |/ / / / / / / | | |/| | | | | | | |