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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use more generic 'Security Token' where possible, add sutitle to create key ↵	Dominik Schürmann	2016-01-10	1	-36/+36
\| \| \| \|	what tokens are supported
*	add method to skip caching	Vincent Breitmoser	2016-01-06	1	-1/+5
\|
*	(fix accidental use of api level 23 method)	Vincent Breitmoser	2016-01-05	1	-5/+10
\|
*	minor fixes to ViewKeyActivity	Vincent Breitmoser	2016-01-05	1	-27/+23
\|
*	Add change password menu item to view key	Dominik Schürmann	2015-12-31	1	-11/+94
\|
*	Improve linked identity handling	Dominik Schürmann	2015-12-31	1	-16/+6
\|
*	Add activity to edit user ids only	Dominik Schürmann	2015-12-30	1	-13/+0
\|
*	Add edit action to user id card, left align card actions per material design ↵	Dominik Schürmann	2015-12-29	1	-4/+3
\| \| \| \|	guidelines
*	Make ContactHelper less static	Dominik Schürmann	2015-12-21	1	-3/+3
\|
*	added Facebook links support, reworked Preferences	Adithya Abraham Philip	2015-12-06	1	-8/+2
\|
*	Show notification when READ_CONTACTS permission is denied in sync service, ↵	Dominik Schürmann	2015-11-23	1	-2/+2
\| \| \| \|	hide linked contact card if permission is denied
*	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2015-11-19	1	-0/+10
\|\
\| *	Merge pull request #1543 from rohands/issue_mouseover_hints	Vincent	2015-11-16	1	-0/+10
\| \|\ \| \| \| \| \| \|	mouseover hints
\| \| *	Class names and string names are updated	rohands	2015-09-22	1	-6/+6
\| \| \|
\| \| *	Updated	rohands	2015-09-20	1	-4/+4
\| \| \|
\| \| *	Mousehints	rohands	2015-09-20	1	-0/+10
\| \| \|
* \| \|	Check if NFC is available before displaying button	Dominik Schürmann	2015-11-19	1	-3/+5
\|/ /
* \|	Properly hide fab in ViewKeyActivity, fixes #1580	Dominik Schürmann	2015-11-02	1	-5/+28
\| \|
* \|	Cleanup, fix advanced sharing	Dominik Schürmann	2015-10-15	1	-4/+2
\| \|
* \|	viewkeyactivity: ask for passphrase for backup only if key has one	Vincent Breitmoser	2015-10-09	1	-3/+29
\| \|
* \|	Merge branch 'master' into encrypted-export	Vincent Breitmoser	2015-10-01	1	-1/+1
\|\ \
\| * \|	Improve NFC exception handling, fixes RuntimeExceptions	Dominik Schürmann	2015-09-30	1	-1/+1
\| \|/
* /	enc-export: use BackupActivity for backup from ViewKeyActivity	Vincent Breitmoser	2015-09-30	1	-7/+8
\|/
*	linked: fix "navigate up" in LinkedIdWizard (imperfect)	Vincent Breitmoser	2015-09-06	1	-1/+2
\|
*	linked: basic shared element transition	Vincent Breitmoser	2015-09-06	1	-6/+15
\|
*	Show linked identity menu item and linked identities only when feature is ↵	Dominik Schürmann	2015-08-29	1	-1/+2
\| \| \| \|	enabled
*	Merge branch 'linked-identities' (and fix OperationHelper ids)	Vincent Breitmoser	2015-08-29	1	-5/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	yubikey: don't assume signing key is masterKeyId in ViewKeyActivity	Vincent Breitmoser	2015-05-16	1	-40/+46
\| \|
\| *	fix fragment handling in ViewKeyActivity	Vincent Breitmoser	2015-05-16	1	-37/+12
\| \|
\| *	use CryptoOperationFragment for linked id fragments, and some warning cleanup	Vincent Breitmoser	2015-04-24	1	-3/+3
\| \|
\| *	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-04-24	1	-41/+139
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
\| * \	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-04-09	1	-4/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
\| * \ \	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-24	1	-194/+71
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
\| * \ \ \	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-15	1	-3/+10
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
\| * \| \| \| \|	rearrange linked id layouts, add CertListWidget	Vincent Breitmoser	2015-03-09	1	-13/+15
\| \| \| \| \| \|
\| * \| \| \| \|	use loader in LinkedIdViewFragment	Vincent Breitmoser	2015-03-09	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	successfully certify linked ids	Vincent Breitmoser	2015-03-08	1	-9/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-08	1	-44/+80
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
\| * \| \| \| \| \|	first steps in ui towards confirmation of linked ids	Vincent Breitmoser	2015-03-06	1	-163/+162
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'development' into linked-identities	Vincent Breitmoser	2015-03-05	1	-33/+28
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add linked it to view key context menu	Vincent Breitmoser	2015-03-02	1	-0/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Make keybase an experimental feature	Dominik Schürmann	2015-08-28	1	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	introduce text protection and fix color change after confirm	Dominik Schürmann	2015-08-28	1	-1/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2015-08-28	1	-1/+3
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of github.com:open-keychain/open-keychain	Vincent Breitmoser	2015-08-27	1	-2/+10
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	use nicer filenames during export	Vincent Breitmoser	2015-08-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Collapsing Toolbar	Dominik Schürmann	2015-08-28	1	-35/+32
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Experimental word comparison	Dominik Schürmann	2015-08-27	1	-2/+10
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Fix key view toolbar and status colour	Thialfihar	2015-07-21	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The status bar wrongly used the same colour as the toolbar, making it indistinguishable from it. This calculates the status bar colour based on the toolbar colour.