aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use material save iconDominik Schürmann2015-03-0411-1/+2
* Merge branch 'adithyaphilip-development' into developmentDominik Schürmann2015-03-048-2/+225
|\
| * Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-048-2/+225
|/|
| * corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-03-0217-41/+104
| |\
| * | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| * | added logging, notify for log exportAdithya Abraham Philip2015-03-013-20/+66
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-284-37/+113
| |\ \
| * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2874-835/+1672
| |\ \ \
| * | | | cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
| * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-2837-651/+1303
| |\ \ \ \
| * | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| * | | | | merged dialogAdithya Abraham Philip2015-02-26835-5627/+14491
| |\ \ \ \ \
| * | | | | | initial Log Display functionAdithya Abraham Philip2015-02-267-0/+117
* | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
* | | | | | | Remove help button for nowDominik Schürmann2015-03-047-16/+3
* | | | | | | More icon naming fixes and designDominik Schürmann2015-03-0424-56/+70
* | | | | | | Partially fix file namesDominik Schürmann2015-03-04222-48/+36
* | | | | | | Fix transifexDominik Schürmann2015-03-041-12/+3
* | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-0455-781/+82
* | | | | | | Update lib listDominik Schürmann2015-03-042-34/+10
* | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
* | | | | | | Crop image view to centerDominik Schürmann2015-03-042-7/+6
* | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-042-8/+8
* | | | | | | ContactHelper cleanupDominik Schürmann2015-03-042-34/+41
* | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-049-119/+129
* | | | | | | Fix status bar orangeDominik Schürmann2015-03-041-1/+1
* | | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
* | | | | | | Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
|\ \ \ \ \ \ \
| * | | | | | | Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-045-44/+33
| * | | | | | | Fixes Issue#1088Ishan Khanna2015-03-042-0/+42
| * | | | | | | Merge remote-tracking branch 'upstream/development' into developmentIshan Khanna2015-03-041-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/development' into developmentIshan Khanna2015-03-0415-65/+79
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed SubmodulesIshan Khanna2015-03-041-0/+2
* | | | | | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
* | | | | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-043-17/+13
* | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |