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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint error fix after testing
\| * \| \| \| \| \| \|	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 67ffc
\| * \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checkstyle configuration information reworked
\| * \| \| \| \| \| \| \| \| \|	Added Windows section to CheckStyle configuration information part (and ↵	Daniel Hammann	2014-03-12	1	-6/+15
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	splitted Linux and MacOSX up).
\| * \| \| \| \| \| \| \| \|	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 travis library installation overhead
\| * \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
\| \| \| \| \| * \| \| \| \|	remove special treatment for unified list query	Vincent Breitmoser	2014-03-13	1	-39/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to.
\| \| \| \| \| * \| \| \| \|	keychainprovider cleanup, kindasorta	Vincent Breitmoser	2014-03-13	2	-56/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?).
\| \| \| \| \| \| \| \| \| *	Merge branch 'master' into certs	Vincent Breitmoser	2014-03-12	178	-1187/+3767
\| \| \| \| \| \| \| \| \| \|\ \| \| \| \| \| \| \|_\|_\|_\|/ \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
\| \| \| \| \| * \| \| \| \|	Merge branch 'unified-keylist'	Vincent Breitmoser	2014-03-12	27	-876/+600
\| \|_\|_\|_\|/\| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
* \| \| \| \| \| \| \| \| \|	Merge pull request #395 from uberspot/master	Dominik Schürmann	2014-03-12	41	-281/+609
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate code from ActionBarHelper. Add export in multiselect.
\| * \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	imports and throw exceptions
\| * \| \| \| \| \| \| \| \| \|	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 ↵	uberspot	2014-03-11	9	-187/+42
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via the method calls
* \| \| \| \| \| \| \| \| \|	Merge pull request #397 from tharinduwijewardane/master	Dominik Schürmann	2014-03-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
\| * \| \| \| \| \| \| \| \| \|	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
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updating my fork
* \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	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 #391
\| * \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| / / / / / / / \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Reset cursor query when closing search view #386
\| * \| \| \| \| \| \| \|	OnFocusChangeListener replaced with OnActionExpandListener	Daniel Hammann	2014-03-11	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For same behaviour like contacts app #386 #387
\| * \| \| \| \| \| \| \|	Reset cursor query when closing search view #386	Daniel Hammann	2014-03-10	1	-0/+10
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without focus the search result get erased.
* \| \| \| \| \| \| \|	Merge pull request #390 from uberspot/master	Dominik Schürmann	2014-03-10	9	-1/+153
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Appropriate save Icon in EditKeyActivity fixes #382
\| * \| \| \| \| \| \| \|	Appropriate save Icon in EditKeyActivity	uberspot	2014-03-11	9	-1/+153
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #383 from sreeram-boyapati/master	Dominik Schürmann	2014-03-10	5	-39/+109
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix to passphrase dialog and Issue #207
\| * \| \| \| \| \| \| \|	Added string reference for Issue #207	Sreeram Boyapati	2014-03-10	2	-4/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	ViewHolder Pattern Implemented	Sreeram Boyapati	2014-03-10	1	-26/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix to passphrase dialog and Issue #207	Sreeram Boyapati	2014-03-10	3	-13/+68
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	More fixes for KeychainIntentServiceHandler	Dominik Schürmann	2014-03-10	1	-41/+43
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Pull from transifex	Dominik Schürmann	2014-03-10	23	-269/+828
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	getString before init of KeychainIntentHandler	Dominik Schürmann	2014-03-10	9	-62/+49
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix progress_generating and reformat	Dominik Schürmann	2014-03-10	1	-1/+1
\| \| \| \| \| \| \| \| \|