aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* work on LinkedIdViewFragmentVincent Breitmoser2015-03-0512-105/+178
* make linked identity list homogeneousVincent Breitmoser2015-03-0512-112/+156
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05525-1403/+1150
|\
| * Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
| |\
| | * #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| * | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| * | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| * | Use material save iconDominik Schürmann2015-03-0410-1/+1
| * | 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-023-9/+23
| | |\ \
| | * | | 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-2873-834/+1671
| | |\ \ \ \
| | * | | | | 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-2836-631/+1271
| | |\ \ \ \ \
| | * | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | * | | | | | merged dialogAdithya Abraham Philip2015-02-26659-3375/+6986
| | |\ \ \ \ \ \
| | * | | | | | | 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-046-15/+3
| * | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-0423-56/+69
| * | | | | | | | Partially fix file namesDominik Schürmann2015-03-04158-13/+13
| * | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-0455-781/+82
| * | | | | | | | Update lib listDominik Schürmann2015-03-041-7/+9
| * | | | | | | | 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
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | 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 'development' of https://github.com/vectorijk/open-keychain into...Dominik Schürmann2015-03-03246-42/+42
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| * | | | | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| * | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 02:25:06 +0000