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

	Commit message (Expand)	Author	Age	Files	Lines
*	Moved Keybase stuff into KeybaseLib submodule	Tim Bray	2014-06-20	4	-223/+31
*	Fix keybase import	Dominik Schürmann	2014-06-20	3	-2/+5
*	Use actionbar button for log activity	Dominik Schürmann	2014-06-20	3	-34/+48
*	Fix onTouchEvent delegation, with workaround for Android bug	Dominik Schürmann	2014-06-20	2	-14/+7
*	Fix update from keyserver flow	Dominik Schürmann	2014-06-20	2	-5/+7
*	Merge pull request #658 from artbristol/functional-testing	Vincent	2014-06-20	8	-41/+203
\|\
\| *	revert to previous min version	Art O Cathain	2014-06-19	1	-1/+1
\| *	Fix hard-coded size	Art O Cathain	2014-06-16	1	-3/+6
\| *	Start on Robolectric integration test	Art O Cathain	2014-06-16	8	-42/+201
* \|	Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...	mar-v-in	2014-06-19	37	-428/+206
\|\ \
\| * \|	Fix app name in PGP header, closing #663	Dominik Schürmann	2014-06-19	1	-1/+1
\| * \|	Fixing fingerprint search, part 1	Dominik Schürmann	2014-06-19	1	-80/+88
\| * \|	Remove unused code to import splitted qr codes	Dominik Schürmann	2014-06-19	2	-96/+1
\| * \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-06-19	3	-124/+3
\| \|\ \
\| \| * \|	remove obsolete subkey binding check from signature verification	Vincent Breitmoser	2014-06-19	3	-124/+3
\| * \| \|	New callback model for ImportKeysActivity	Dominik Schürmann	2014-06-19	7	-108/+95
\| \|/ /
\| * \|	Reference ic_launcher instead of icon	Dominik Schürmann	2014-06-18	4	-4/+4
\| * \|	decrease size of search icons in import	Dominik Schürmann	2014-06-18	2	-2/+2
\| * \|	forward touch events to pager in import activity	Vincent Breitmoser	2014-06-18	1	-0/+13
\| * \|	Fix new actionbar icon sizes, rename icon to ic_launcher following Android na...	Dominik Schürmann	2014-06-18	16	-3/+3
\| * \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-06-18	4	-5/+9
\| \|\ \
\| \| * \|	fix key export	Vincent Breitmoser	2014-06-18	1	-1/+1
\| \| * \|	canonicalize: missed two logging entries	Vincent Breitmoser	2014-06-18	3	-4/+8
\| * \| \|	consistent button design in import activity	Dominik Schürmann	2014-06-18	2	-18/+0
\| \|/ /
* \| \|	Merge branch 'master' into improve-file	mar-v-in	2014-06-18	75	-2062/+3204
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/master'	Vincent Breitmoser	2014-06-18	3	-57/+201
\| \|\ \
\| \| * \	Merge pull request #661 from mar-v-in/improve-contacts	Dominik Schürmann	2014-06-18	2	-53/+198
\| \| \|\ \
\| \| \| * \|	Reset importDone at the beginning of sync	mar-v-in	2014-06-18	1	-0/+1
\| \| \| * \|	Wait for import to be done before writing contacts	mar-v-in	2014-06-18	1	-2/+19
\| \| \| * \|	Remove abandoned contacts	mar-v-in	2014-06-18	1	-26/+90
\| \| \| * \|	Code style	mar-v-in	2014-06-18	1	-13/+26
\| \| \| * \|	Continue contact db sync	mar-v-in	2014-06-18	1	-39/+89
\| * \| \| \|	Merge branch 'new-edit'	Vincent Breitmoser	2014-06-18	9	-991/+315
\| \|\ \ \ \
\| \| * \| \| \|	new-edit: add logging to modifySecretKeyRing operation	Vincent Breitmoser	2014-06-17	4	-72/+158
\| \| * \| \| \|	new-edit: add new save keyring stuff	Vincent Breitmoser	2014-06-17	3	-151/+124
\| \| * \| \| \|	new-edit: remove old save keyring stuff	Vincent Breitmoser	2014-06-17	6	-819/+83
\| * \| \| \| \|	generate public keyring from secret if not available	Vincent Breitmoser	2014-06-18	4	-21/+39
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	consolidate: almost sane logging	Vincent Breitmoser	2014-06-18	4	-49/+63
\| * \| \| \|	consolidate: add key import routines with consolidation	Vincent Breitmoser	2014-06-18	7	-53/+198
\| * \| \| \|	consolidate: make it work	Vincent Breitmoser	2014-06-18	4	-105/+126
\| * \| \| \|	code cleanup in ProviderHelper and UncachedKeyRing	Vincent Breitmoser	2014-06-18	2	-36/+22
\| * \| \| \|	consolidate: add logging	Vincent Breitmoser	2014-06-18	5	-8/+61
\| * \| \| \|	consolidate: first draft	Vincent Breitmoser	2014-06-18	2	-4/+115
\| * \| \| \|	import-log: don't count self certs as unknown	Vincent Breitmoser	2014-06-18	1	-0/+1
\| * \| \| \|	prepare ProviderHelper for consolidation before insert	Vincent Breitmoser	2014-06-18	2	-75/+87
\| * \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-06-18	7	-109/+265
\| \|\ \ \ \
\| \| * \| \| \|	handle database error on secret key insert	Vincent Breitmoser	2014-06-17	3	-1/+6
\| \| * \| \| \|	canonicalize: support secret keys	Vincent Breitmoser	2014-06-17	4	-14/+36
\| \| \|/ / /
\| \| * \| \|	import-log: clean up progress messages	Vincent Breitmoser	2014-06-17	2	-7/+6
\| \| * \| \|	canonicalize: fix NullPointerException	Vincent Breitmoser	2014-06-17	1	-1/+2