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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Add + button besides TokenAutoComplete, Issue #925"	Dominik Schürmann	2016-05-12	1	-9/+1
\| \| \| \| \| \| \|	This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
*	update progress handling in PgpDecryptVerifyOperation	Vincent Breitmoser	2016-05-11	1	-1/+2
\| \| \| \| \| \| \| \|	- less progress messages overall - report progress again based on input stream position, if filesize is known - limit progress messages to one every 200ms while decrypting - also fixed a bug in DecryptListFragment, the recycler view now reuses old views as intended instead of crossfading all the time.
*	Revert "Added warning dialog for importing keys"	Dominik Schürmann	2016-05-05	1	-2/+0
\| \| \| \| \| \| \|	This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml
*	Slight amendments for clarity	Alex Fong	2016-05-05	1	-1/+1
\|
*	Added warning dialog for importing keys	Alex Fong	2016-05-05	1	-0/+2
\|
*	Removed unrequired code, standardized terms used.	Alex Fong	2016-05-05	1	-1/+1
\|
*	(WIP) Change password when key is stripped #1692	Alex Fong	2016-05-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|	Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
*	Fix error codes for ykneo-openpgp 1.0.11	Dominik Schürmann	2016-04-30	1	-3/+3
\|
*	Improve security_token_error_iso_dep_not_supported	Dominik Schürmann	2016-04-30	1	-1/+1
\|
*	Fix german title from transifex	Dominik Schürmann	2016-04-30	1	-1/+1
\|
*	Merge pull request #1819 from 007durgesh219/Issue#1817	Dominik Schürmann	2016-04-29	1	-0/+1
\|\ \| \| \| \|	Fix Crash when no encryption subkey is available, Issue #1817
\| *	Fix Crash when no encryption subkey is available, Issue #1817	Durgesh	2016-04-14	1	-0/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Durgesh <007durgesh219@gmail.com>
* \|	Use proper ImportKeysProxyActivity to scan QR Codes	Dominik Schürmann	2016-04-29	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵	Dominik Schürmann	2016-04-29	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \|	LuboViluda-master
\| * \|	unnecesary code removed	Lubo Viluda	2016-04-12	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- setContentView removed - R.layout.redirect_import_keys_activity.xml removed
\| * \|	Unnecesary code removed and string repaired	Lubo Viluda	2016-04-12	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired
\| * \|	upgrade of Redirect import activity	Lubo Viluda	2016-03-24	3	-74/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
\| * \|	#1661 - Don't expose CertifyActivity	Lubo Viluda	2016-03-20	4	-0/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly Add intent filter for the activity *Change intent filter for CertifyActivity
* \| \|	Re-enable move-to-card option, improve strings	Dominik Schürmann	2016-04-29	1	-7/+7
\| \| \|
* \| \|	Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵	Dominik Schürmann	2016-04-29	1	-1/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	into 007durgesh219-Issue#925
\| * \| \|	Add + button besides TokenAutoComplete, Issue #925	Durgesh	2016-04-14	1	-1/+9
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Durgesh <007durgesh219@gmail.com>
* \| \|	Merge pull request #1831 from fiaxh/key_creation_flexible	Dominik Schürmann	2016-04-29	2	-2/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Handle user input on key creation more generously
\| * \| \|	Handle user input on key creation more generously	fiaxh	2016-04-15	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow empty name and do not regex-check email fixes #1825
* \| \| \|	New translations from transifex	Dominik Schürmann	2016-04-29	60	-660/+2222
\| \| \| \|
* \| \| \|	Fix strings	Dominik Schürmann	2016-04-18	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2016-04-18	1	-0/+1
\|\ \ \ \
\| * \ \ \	Merge pull request #1835 from nmikhailov/check_security_token	Dominik Schürmann	2016-04-16	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Check security token
\| \| * \| \| \|	Check if security token keys match required once before signing/decryption	Nikita Mikhailov	2016-04-16	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix delete_fail	Dominik Schürmann	2016-04-18	1	-1/+1
\|/ / / / /
* / / / /	Fix string	Dominik Schürmann	2016-04-16	1	-1/+1
\|/ / / /
* \| \| \|	OTG: Implement hidden activity usb detection technique	Nikita Mikhailov	2016-04-14	1	-1/+24
\| \| \| \|
* \| \| \|	OTG: Add usb device manager prototype	Nikita Mikhailov	2016-04-14	1	-0/+4
\| \|/ / \|/\| \|
* \| \|	Fix string	Dominik Schürmann	2016-04-13	1	-1/+1
\| \| \|
* \| \|	Merge branch 'backup-code'	Dominik Schürmann	2016-04-12	6	-69/+1428
\|\ \ \
\| * \| \|	Fix in-app help for backup codes	Dominik Schürmann	2016-04-12	1	-1/+1
\| \| \| \|
\| * \| \|	Revert usage of masked-edittext, back to plain edittexts for backup codes	Dominik Schürmann	2016-04-12	5	-68/+1427
\| \| \| \|
* \| \| \|	Fix strings	Dominik Schürmann	2016-04-12	1	-3/+3
\|/ / /
* \| \|	Merge pull request #1772 from runnerway/importkey-encrypted	Vincent	2016-04-12	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Handle encrypted files in "import key" file selection
\| * \| \|	Handle encrypted files while importing keys	Andrea Torlaschi	2016-03-27	1	-0/+1
\| \| \| \|
* \| \| \|	Add missing keyholder string param	Nikita Mikhailov	2016-04-11	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar	Vincent	2016-04-06	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	tint linked contact picture in toolbar #1298
\| * \| \|	Used a constant instead of magic number for colour	Victor Hazali	2016-04-04	1	-0/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Explicitly stated the blending mode
* \| \|	Merge pull request #1808 from vhazali/warn-when-stripping-master-key	Vincent	2016-04-04	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Warn when stripping master key #1554
\| * \| \|	Corrected warning message	Victor Hazali	2016-04-01	1	-1/+1
\| \| \| \|
\| * \| \|	Corrected capitalisation of subkey	Victor Hazali	2016-03-30	1	-2/+2
\| \| \| \|
\| * \| \|	Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into ↵	Victor Hazali	2016-03-30	1	-0/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \|	warn-when-stripping-master-key
\| \| * \|	Alert for Stripping Subkeys.	tdjogi010@gmail.com	2016-03-02	1	-0/+3
\| \| \| \|
* \| \| \|	Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions	Vincent	2016-04-04	8	-133/+91
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refer to issue #1600 Limit create key options
\| * \| \| \|	Redesigned subkey creation dialog and changed default key type created to ↵	Alex Fong	2016-04-01	8	-133/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
* \| \| \| \|	Fix Display Key in UploadKeyActivity, Issue #506	Durgesh	2016-03-31	2	-2/+6
\| \| \| \| \|