connectbot-yubikey/open-keychain - open-keychain with patches to support ssh authentication

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-02-28	3	-4/+85
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
\| *	control flow for moving the fab up with snackbar	Vincent Breitmoser	2015-02-28	3	-5/+85
\| \|
* \|	Update from transifex	Dominik Schürmann	2015-02-28	1	-2/+0
\|/
*	Simplify MainActivity	Dominik Schürmann	2015-02-28	2	-52/+23
\|
*	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-02-27	2	-5/+32
\|\ \| \| \| \| \| \|	development
\| *	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Vincent Breitmoser	2015-02-27	4	-172/+9
\| \|\ \| \| \| \| \| \| \| \| \|	development
\| * \|	slightly longer color fade duration	Vincent Breitmoser	2015-02-27	1	-3/+3
\| \| \|
\| * \|	transition status color in key view	Vincent Breitmoser	2015-02-27	1	-3/+30
\| \| \|
\| * \|	hand through result in CertifyFingerprintActivity	Vincent Breitmoser	2015-02-27	1	-2/+2
\| \| \|
* \| \|	Reorder advanced key view	Dominik Schürmann	2015-02-27	2	-59/+7
\| \|/ \|/\|
* \|	Enable multi line snackbar option	Dominik Schürmann	2015-02-27	1	-1/+5
\| \|
* \|	Remove swipte to refresh src, fix padding in key list	Dominik Schürmann	2015-02-27	2	-167/+0
\| \|
* \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-02-27	2	-8/+131
\|\\| \| \| \| \| \| \|	development
\| *	show refresh key progress inline	Vincent Breitmoser	2015-02-27	2	-8/+131
\| \|
* \|	Fix status images in user id adapter	Dominik Schürmann	2015-02-27	1	-4/+4
\|/
*	Keybase header text	Dominik Schürmann	2015-02-27	1	-2/+2
\|
*	go to directly to certify screen after nfc import	Vincent Breitmoser	2015-02-27	4	-85/+70
\|
*	Prettify qr code in advanced key view	Dominik Schürmann	2015-02-27	1	-7/+23
\|
*	Uncluttering advanced key view	Dominik Schürmann	2015-02-27	3	-250/+0
\|
*	Simplify delete key dialog	Dominik Schürmann	2015-02-27	2	-4/+9
\|
*	Remove unused BadImportKeyDialogFragment	Dominik Schürmann	2015-02-27	1	-67/+0
\|
*	Merge keybase-proof branch	Dominik Schürmann	2015-02-27	7	-11/+805
\|\
\| *	Merge branch 'development' into keybase-proofs	Dominik Schürmann	2014-12-05	1	-1/+1
\| \|\
\| * \	Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs	Tim Bray	2014-11-21	1	-2/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
\| \| * \|	fix signature check	Dominik Schürmann	2014-11-22	1	-2/+2
\| \| \| \|
\| * \| \|	Add check that proof & database fingerprints are the same	Tim Bray	2014-11-21	2	-4/+8
\| \|/ /
\| * \|	Dont accept signatures by expired or revoked subkeys	Dominik Schürmann	2014-11-22	4	-9/+13
\| \| \|
\| * \|	Use master key id for keybase proof verification	Dominik Schürmann	2014-11-22	1	-10/+4
\| \| \|
\| * \|	Merge branch 'development' into keybase-proofs	Dominik Schürmann	2014-11-21	4	-25/+20
\| \|\ \
\| * \| \|	Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵	Tim Bray	2014-11-19	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gracefully. Fixes #1007 & #1008.
\| * \| \|	In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵	Tim Bray	2014-11-18	2	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rest. Also mention Keybase stuff other than Twitter/GitHub/Website
\| * \| \|	All keybase proofs now in place	Tim Bray	2014-11-11	3	-44/+89
\| \| \| \|
\| * \| \|	Fix a no-result corner case, and make verifications clickable	Tim Bray	2014-11-07	1	-1/+2
\| \| \| \|
\| * \| \|	Moved from WebView to Spannables, some proof cleanup too	Tim Bray	2014-11-07	5	-21/+732
\| \| \| \|
* \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Vincent Breitmoser	2015-02-26	2	-5/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \| \| \|	Remove old Holo design resources	Dominik Schürmann	2015-02-26	1	-3/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-02-26	1	-4/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \| \| \| \|	Hopefully fixes drop down icon for spinners on Android lower 5	Dominik Schürmann	2015-02-26	1	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	split up and mark unsafe expiry-related methods	Vincent Breitmoser	2015-02-26	3	-6/+27
\| \| \| \| \| \|
* \| \| \| \| \|	save revocation instead of self-cert for revoked uids	Vincent Breitmoser	2015-02-26	1	-12/+19
\| \| \| \| \| \|
* \| \| \| \| \|	ignore revoked user ids for primary key expiry	Vincent Breitmoser	2015-02-26	5	-23/+82
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	pre-select certification key if only one is available	Vincent Breitmoser	2015-02-26	1	-4/+5
\|/ / / /
* \| \| \|	Fingerprint verification, design fixes for qr code card	Dominik Schürmann	2015-02-26	4	-42/+309
\| \| \| \|
* \| \| \|	Dont show verification icons in my key view, hide edit button for non-secret ↵	Dominik Schürmann	2015-02-25	4	-45/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keys
* \| \| \|	Invoke NFC button	Dominik Schürmann	2015-02-25	1	-0/+28
\| \| \| \|
* \| \| \|	Other icon for key exchange	Dominik Schürmann	2015-02-25	1	-1/+1
\| \| \| \|
* \| \| \|	Design fixes for header, QR Code shared element transitions	Dominik Schürmann	2015-02-25	3	-42/+58
\| \| \| \|
* \| \| \|	CardView and more header design	Dominik Schürmann	2015-02-25	4	-15/+37
\| \| \| \|
* \| \| \|	Fix menu	Dominik Schürmann	2015-02-25	1	-0/+2
\| \| \| \|
* \| \| \|	Toolbar: qr code in header, cleanup of fragment	Dominik Schürmann	2015-02-25	2	-484/+226
\| \| \| \|