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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/master'	Vincent Breitmoser	2014-07-02	16	-461/+341
\|\
\| *	edit key: work on saving	Dominik Schürmann	2014-07-02	4	-31/+24
\| *	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-02	3	-2/+7
\| \|\
\| * \|	Edit key: adding user ids	Dominik Schürmann	2014-07-02	14	-236/+330
\| * \|	edit key: part 3	Dominik Schürmann	2014-07-01	5	-387/+180
* \| \|	Merge branch 'create-keyring'	Vincent Breitmoser	2014-07-02	9	-104/+342
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	support changing primary user id in SaveKeyringParcel	Vincent Breitmoser	2014-07-02	3	-4/+115
\| * \|	use expert create key for key creation testing (revert this later on!)	Vincent Breitmoser	2014-07-02	1	-5/+50
\| * \|	fix subkey addition	Vincent Breitmoser	2014-07-02	2	-37/+62
\| * \|	add create key capabilities to SaveKeyringParcel	Vincent Breitmoser	2014-06-29	7	-61/+118
* \| \|	forgot a line in previous commit	Vincent Breitmoser	2014-07-02	1	-0/+1
* \| \|	don't use zero plural string for english	Vincent Breitmoser	2014-07-02	2	-2/+6
\| \|/ \|/\|
* \|	remove leftover of AndroidBootstrap	Dominik Schürmann	2014-06-30	1	-0/+0
* \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-06-30	58	-159/+268
\|\ \
\| * \|	Fixed Bootstrap resource	Daniel Albert	2014-06-30	1	-1/+1
\| * \|	(should have) fixed Travis builds	Daniel Albert	2014-06-30	2	-7/+2
\| * \|	Deprecated Android Bootstrap, thus fixing #597	Daniel Albert	2014-06-30	1	-1/+0
\| * \|	Fixed, issue #702	Daniel Albert	2014-06-30	1	-1/+1
\| * \|	Merge branch 'master' of https://github.com/open-keychain/open-keychain	Daniel Albert	2014-06-30	30	-309/+1460
\| \|\\|
\| * \|	Converted all other buttons	Daniel Albert	2014-06-30	23	-60/+48
\| * \|	Ported even more buttons to use new design (Key and User editor)	Daniel Albert	2014-06-29	17	-37/+102
\| * \|	Converted AsymetricKeyFragment to new button style	Daniel Albert	2014-06-29	2	-9/+6
\| * \|	Added new button style and converted account_settings and the select_secret_k...	Daniel Albert	2014-06-29	9	-19/+51
\| * \|	Updated file_dialog to use the new buttons	Daniel Albert	2014-06-29	3	-13/+9
\| * \|	Improved button style	Daniel Albert	2014-06-29	3	-21/+12
\| * \|	Added button_rounded style	Daniel Albert	2014-06-28	3	-6/+52
* \| \|	work on edit key	Dominik Schürmann	2014-06-30	7	-40/+84
\| \|/ \|/\|
* \|	pass import results through to viewkeyactivity on update	Vincent Breitmoser	2014-06-28	5	-83/+125
* \|	fix nullpointerexception in importkeyactivity	Vincent Breitmoser	2014-06-28	3	-3/+20
* \|	code cleanup and plurals in import log entries	Vincent Breitmoser	2014-06-28	9	-154/+140
* \|	Merge remote-tracking branch 'upstream/master'	Daniel Albert	2014-06-28	19	-71/+1177
\|\ \ \| \|/ \|/\|
\| *	Magic to find possible mails and names of device owner	Dominik Schürmann	2014-06-28	5	-5/+147
\| *	More wizardry	Dominik Schürmann	2014-06-27	5	-104/+202
\| *	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-06-27	8	-91/+257
\| \|\
\| * \|	Start work on a first-time wizard	Dominik Schürmann	2014-06-27	8	-4/+622
\| * \|	new edit key: first version to add user ids	Dominik Schürmann	2014-06-24	7	-58/+306
* \| \|	Switched to the dark icons	Daniel Albert	2014-06-28	4	-0/+0
* \| \|	Added unlock icon, fixed drawer items, switched to icons from resource in drawer	Daniel Albert	2014-06-27	6	-14/+20
* \| \|	Swapped out FontawesomeText with normal ImageView	Daniel Albert	2014-06-26	1	-10/+6
\| \|/ \|/\|
* \|	Temporary fix for #648	Daniel Albert	2014-06-25	1	-0/+8
* \|	Merge pull request #690 from mar-v-in/hkps-by-default	Dominik Schürmann	2014-06-25	6	-90/+244
\|\ \
\| * \|	Move sks-keyservers.net CA into assets folder	mar-v-in	2014-06-25	5	-41/+85
\| * \|	Merge branch 'master' into hkps-by-default	mar-v-in	2014-06-24	15	-65/+563
\| \|\ \
\| * \| \|	Fix sks-keyservers.net sub pool	mar-v-in	2014-06-24	1	-1/+1
\| * \| \|	Update Keyservers to use hkps as needed	mar-v-in	2014-06-24	3	-2/+25
\| * \| \|	Use URLEncoder instead of Uri.encode	mar-v-in	2014-06-24	1	-2/+6
\| * \| \|	Rewrote hkp add to work with hkps as well.	mar-v-in	2014-06-24	1	-24/+13
\| * \| \|	Few fixes on hkps	mar-v-in	2014-06-23	2	-35/+34
\| * \| \|	Add hkps support for sks-keyservers.net	mar-v-in	2014-06-23	2	-65/+77
\| * \| \|	Add TlsHelper (designed to be used with sks-keyservers.net)	mar-v-in	2014-06-23	1	-0/+83