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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'linked-identities' (and fix OperationHelper ids)	Vincent Breitmoser	2015-08-29	1	-6/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
*	linked-ids: rename "cookie" to "token"	Vincent Breitmoser	2015-05-09	1	-2/+2
\|
*	linked-ids: code cleanup, handle all lint errors	Vincent Breitmoser	2015-05-09	1	-21/+20
\|
*	work on cookie scanning during creation	Vincent Breitmoser	2015-03-24	1	-1/+2
\|
*	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-24	1	-3/+3
\| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
*	work on second step of identity creation	Vincent Breitmoser	2015-03-13	1	-17/+5
\|
*	remove notiion of nonce/identifier	Vincent Breitmoser	2015-03-13	1	-2/+1
\|
*	use final fragment superclass for dns	Vincent Breitmoser	2015-03-06	1	-213/+18
\|
*	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-05	1	-3/+3
\| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
*	do a TON of UI work	Vincent Breitmoser	2015-03-05	1	-3/+5
\|
*	work more on separation of linked identities and resources, initial ui work	Vincent Breitmoser	2015-03-04	1	-5/+5
\|
*	some fixes for compiling (still not working!)	Vincent Breitmoser	2015-03-02	1	-3/+3
\|
*	linked id ui work dns/twitter	Vincent Breitmoser	2015-01-16	1	-3/+3
\|
*	affirmation -> linked identity	Vincent Breitmoser	2015-01-15	1	-0/+360