connectbot-yubikey/connectbot - connectbot with patches for nfc authentication

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	fix merge error	Kenny Root	2015-07-15	1	-1/+1
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-07-15	1	-4/+4
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-07-15	6	-5/+45
\|
*	Upgrade to new Android Studio metafiles	Kenny Root	2015-06-09	1	-6/+4
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-06-09	1	-10/+1
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-06-09	1	-4/+1
\|
*	Scale entropy dialog text with display density	Kenny Root	2015-06-09	1	-1/+1
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-06-09	2	-3/+4
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-06-01	2	-3/+3
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-19	2	-5/+25
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-19	3	-67/+22
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-17	1	-2/+2
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-16	1	-15/+11
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-14	30	-103/+3
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-05	2	-3/+3
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-05	1	-1/+1
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-05	2	-3/+8
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-02	1	-2/+2
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-02	3	-0/+10
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-04-03	2	-9/+28
\|
*	Return empty port forward list if host arg is null	Kenny Root	2015-03-29	1	-1/+4
\| \| \| \| \|	There would be a NullPointerException if the host passed in was null, so just preclude it by checking.
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-28	1	-4/+1
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-28	2	-4/+7
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-28	1	-1/+5
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	11	-21/+52
\| \| \| \|	Change-Id: I4ea022cf42d3aea8e52d8e4fbd604575c109df1d
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	1	-0/+5
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	3	-58/+74
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	5	-5/+31
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	1	-1/+0
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-27	4	-158/+211
\| \| \| \| \|	Conflicts: app/src/main/java/org/connectbot/util/UberColorPickerDialog.java
*	Update translations	Kenny Root	2015-03-26	45	-72/+53
\|
*	Add translation gradle tasks	Kenny Root	2015-03-26	3	-0/+4
\|
*	Move notification icons to correct directory	Kenny Root	2015-03-26	3	-0/+0
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	7	-9/+52
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	1	-0/+2
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	1	-0/+3
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2015-03-26	1	-0/+1
\|
*	Add some whitespace rules and fixes for them	Kenny Root	2015-03-23	25	-219/+234
\|
*	Clean up some import style violations	Kenny Root	2015-03-23	4	-12/+7
\|
*	Update Android Studio configs	Kenny Root	2015-03-23	1	-1/+2
\|
*	checkstyle: fix leading spaces	Kenny Root	2015-03-23	1	-1/+1
\|
*	Merge remote-tracking branch 'origin/master'	Kenny Root	2015-03-23	42	-272/+201
\| \| \| \| \| \|	Conflicts: app/src/main/java/org/connectbot/HostListActivity.java app/src/main/java/org/connectbot/service/TerminalKeyListener.java
*	Update to latest build system	Kenny Root	2015-03-23	2	-8/+12
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2014-10-21	1	-16/+27
\|
*	Merge branch 'master' into gradle-conversion	Kenny Root	2014-10-19	7	-0/+0
\| \| \| \|	Change-Id: I77af95fa7ddb22c99f13f0770daba02a98bcf5b7
*	Merge branch 'master' into gradle-conversion	Kenny Root	2014-10-18	1	-2/+2
\|
*	Fix keyType layout and space out buttons a bit	Kenny Root	2014-10-18	1	-4/+6
\| \| \| \|	Change-Id: Idd46bb2ada1ff7ac934d5e20faee97842a990102
*	Disable EC generation when no support	Kenny Root	2014-10-18	1	-0/+7
\| \| \| \|	Change-Id: I1d03afa0a37cfa2779e1264aaf16052c6539640f
*	Update Android Studio files	Kenny Root	2014-10-18	1	-1/+1
\| \| \| \|	Change-Id: Ieffe7d5d7253ebdaa06ca556affd7b8b91062b04
*	Add class hiding for KeyEvent debugging	Kenny Root	2014-10-18	1	-3/+54
\| \| \| \|	Change-Id: Id34acf00f9ec538d81b72b970ae1990c6ed36510