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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #403 from Valodim/master	Dominik Schürmann	2014-03-13	27	-875/+549
\|\
\| *	drop unified uri in favor of generic /key_rings	Vincent Breitmoser	2014-03-13	2	-15/+10
\| *	Merge remote-tracking branch 'origin/master'	Vincent Breitmoser	2014-03-13	18	-51/+151
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #388 from ajit766/exportkeyfix	Dominik Schürmann	2014-03-13	4	-16/+56
\|\ \
\| * \|	Export cancellable - minor changes	grait	2014-03-13	3	-6/+10
\| * \|	Export is cancellable now	grait	2014-03-13	3	-16/+52
\|/ /
* \|	Merge pull request #396 from bhargavgolla/Lint-error-fix	Dominik Schürmann	2014-03-12	11	-17/+20
\|\ \
\| * \|	Removing tab	Bhargav Golla	2014-03-10	1	-1/+1
\| * \|	Removing unused string	Bhargav Golla	2014-03-10	1	-1/+1
\| * \|	Merge remote-tracking branch 'upstream/master' into Lint-error-fix	Bhargav Golla	2014-03-10	49	-481/+1293
\| \|\ \
\| * \| \|	Lint changes after testing	Bhargav Golla	2014-03-10	12	-19/+21
* \| \| \|	Merge pull request #404 from uberspot/master	Dominik Schürmann	2014-03-12	2	-12/+60
\|\ \ \ \
\| * \| \| \|	change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526	uberspot	2014-03-12	2	-12/+60
* \| \| \| \|	Merge pull request #405 from honnel/checkstyle	Dominik Schürmann	2014-03-12	1	-6/+15
\|\ \ \ \ \
\| * \| \| \| \|	Added Windows section to CheckStyle configuration information part (and split...	Daniel Hammann	2014-03-12	1	-6/+15
\| * \| \| \| \|	Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain	Daniel Hammann	2014-03-12	44	-336/+660
\| \|\\| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain	Daniel Hammann	2014-03-11	48	-458/+1260
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge pull request #406 from Emantor/tests_and_travis	Dominik Schürmann	2014-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Reduce library installation overhead	Emantor	2014-03-12	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| \| \| \| *	merge fixes as per comments in merge	Vincent Breitmoser	2014-03-13	1	-30/+19
\| \| \| \| \| *	remove special treatment for unified list query	Vincent Breitmoser	2014-03-13	1	-39/+14
\| \| \| \| \| *	keychainprovider cleanup, kindasorta	Vincent Breitmoser	2014-03-13	2	-56/+47
\| \| \| \| \| *	Merge branch 'unified-keylist'	Vincent Breitmoser	2014-03-12	27	-876/+600
\| \|_\|_\|_\|/\| \|/\| \| \| \| \|
\| \| \| \| \| *	add contact count to My Keys header	Vincent Breitmoser	2014-03-08	3	-2/+30
\| \| \| \| \| *	better handling of multi select in ListKeysFragment	Vincent Breitmoser	2014-03-08	1	-17/+22
\| \| \| \| \| *	ditch old key list activities	Vincent Breitmoser	2014-03-08	19	-1433/+6
\| \| \| \| \| *	add edit button and secret key info to public key view	Vincent Breitmoser	2014-03-08	5	-2/+71
\| \| \| \| \| *	move some placeholders into resources	Vincent Breitmoser	2014-03-08	4	-5/+6
\| \| \| \| \| *	Normalize public key uri in KeyListFragment	Vincent Breitmoser	2014-03-08	3	-6/+29
\| \| \| \| \| *	Make EditKeyActivity's uri handling (more) sane	Vincent Breitmoser	2014-03-08	2	-6/+4
\| \| \| \| \| *	working unified list (no actions yet)	Vincent Breitmoser	2014-03-08	9	-246/+450
\| \| \| \| \| *	copy public keylist as stub for unified keylist	Vincent Breitmoser	2014-03-06	8	-5/+776
* \| \| \| \| \|	Merge pull request #395 from uberspot/master	Dominik Schürmann	2014-03-12	41	-281/+609
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add Email suggestions in Create Key activity	uberspot	2014-03-12	4	-6/+55
\| * \| \| \| \| \|	fix plenty of lint warnings, make some for loops into foreach, remove unused ...	uberspot	2014-03-11	15	-24/+24
\| * \| \| \| \| \|	Added initial xml and readme info for checkstyle	uberspot	2014-03-11	3	-0/+365
\| * \| \| \| \| \|	minor clean up in colorize method	uberspot	2014-03-11	1	-2/+3
\| * \| \| \| \| \|	Add export... button and functionality in multi-select	uberspot	2014-03-11	10	-12/+31
\| * \| \| \| \| \|	Make export work with rowIds instead of MasterKeyIds	uberspot	2014-03-11	6	-53/+92
\| * \| \| \| \| \|	Remove duplicate code from ActionBarHelper. You can now set the drawables via...	uberspot	2014-03-11	9	-187/+42
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #397 from tharinduwijewardane/master	Dominik Schürmann	2014-03-12	1	-0/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed	Tharindu Wijewardane	2014-03-11	1	-0/+1
\| * \| \| \| \| \|	Merge pull request #1 from openpgp-keychain/master	Tharindu Wijewardane	2014-03-11	60	-596/+1561
\| \|\\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #402 from mb-14/hkpget	Dominik Schürmann	2014-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix error in importing/updating keys from keyserver by removing extra 0x	Miroojin Bakshi	2014-03-12	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	more tight layout	Dominik Schürmann	2014-03-11	1	-12/+10
* \| \| \| \| \|	cleanup	Dominik Schürmann	2014-03-11	2	-43/+37
* \| \| \| \| \|	Merge pull request #394 from sreeram-boyapati/master	Dominik Schürmann	2014-03-11	1	-1/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	linear layout edited to display test horizontally	Sreeram Boyapati	2014-03-11	1	-1/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #392 from honnel/cursor-reset2	Dominik Schürmann	2014-03-11	1	-0/+14
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| / / / \| \| \|/ / / \| \|/\| \| \|