aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-042-2/+203
|\ \
| * | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-03-021-7/+20
| |\ \
| * | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| * | | added logging, notify for log exportAdithya Abraham Philip2015-03-012-20/+59
| * | | 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-2815-380/+375
| |\ \ \ \
| * | | | | 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-2824-463/+1033
| |\ \ \ \ \
| * | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| * | | | | | merged dialogAdithya Abraham Philip2015-02-2641-573/+1931
| |\ \ \ \ \ \
| * | | | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+102
* | | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
* | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-042-16/+16
* | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-042-17/+8
* | | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
* | | | | | | | Crop image view to centerDominik Schürmann2015-03-041-3/+2
* | | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
* | | | | | | | 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
* | | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
* | | | | | | | 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-032-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | icon name changes in UI filesjiangkai2015-03-032-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
* | | | | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-033-44/+47
* | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-24/+25
|/ / / / / / / /
* | | | | | | | 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
* | | | | | | | 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
|/ / / / / / /
* | | | | | | rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
* | | | | | | forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
* | | | | | | 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-021-7/+20
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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-024-115/+143
* | | | | | 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
* | | | fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
* | | | small Notify cleanupVincent Breitmoser2015-02-281-24/+2
* | | | clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10