aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02861-9745/+15744
|\
| * 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
| * collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| * animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
| * Strings: File sizeDominik Schürmann2015-02-281-2/+2
| * Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| * forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-284-6/+89
| |\
| | * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-284-7/+89
| * | Update from transifexDominik Schürmann2015-02-2834-238/+1010
| |/
| * Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| * Upload new keys to keyserver by defaultDominik Schürmann2015-02-281-0/+1
| * padding fixes for key listDominik Schürmann2015-02-281-2/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-272-5/+32
| |\
| | * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-02-2715-211/+76
| | |\
| | * | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| | * | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| | * | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
| * | | Reorder advanced key viewDominik Schürmann2015-02-274-111/+7
| | |/ | |/|
| * | Enable multi line snackbar optionDominik Schürmann2015-02-272-2/+6
| * | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-273-208/+27
| * | Fix keyboard overlay bug on top of edittextsDominik Schürmann2015-02-2710-5/+47
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-275-8/+156
| |\|
| | * show refresh key progress inlineVincent Breitmoser2015-02-275-8/+156
| * | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
| |/
| * Keybase header textDominik Schürmann2015-02-275-107/+129
| * Better qr code resizingDominik Schürmann2015-02-276-5/+48
| * go to directly to certify screen after nfc importVincent Breitmoser2015-02-275-94/+79
| * Prettify qr code cleanupDominik Schürmann2015-02-271-10/+0
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-272-12/+50
| * Uncluttering advanced key viewDominik Schürmann2015-02-275-383/+0
| * Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
| * Remove unused BadImportKeyDialogFragmentDominik Schürmann2015-02-271-67/+0
| * Fix margins of dialog viewsDominik Schürmann2015-02-276-21/+30
| * Merge keybase-proof branchDominik Schürmann2015-02-2710-11/+987
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-056-12/+10
| | |\
| | * | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| | * | Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofsTim Bray2014-11-211-2/+1
| | |\ \
| | | * | fix signature checkDominik Schürmann2014-11-221-2/+2
| | * | | Add check that proof & database fingerprints are the sameTim Bray2014-11-212-4/+8
| | |/ /
| | * | Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-224-9/+13
| | * | Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
| | * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-218-44/+34
| | |\ \
| | * \ \ Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keycha...Tim Bray2014-11-191-2/+2
| | |\ \ \
| | | * \ \ Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into ...Dominik Schürmann2014-11-193-3/+21
| | | |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 14:10:17 +0000