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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'development' into v/crypto-input-parcel	Dominik Schürmann	2015-03-26	1	-14/+76
\|\
\| *	Modify break as return.	iseki	2015-03-26	1	-1/+1
\| \|
\| *	Add brackets for if-else constructs and externalize the procedure as ↵	iseki	2015-03-26	1	-26/+33
\| \| \| \| \| \| \| \|	showMultiExportDialog.
\| *	Add a loop for multiple key export.	iseki	2015-03-25	1	-13/+68
\| \|
* \|	Start refactoring encrypt ui, EncryptFileActivity no longer crashing	Dominik Schürmann	2015-03-26	9	-516/+539
\| \|
* \|	Fix certify with CryptoInputParcel	Dominik Schürmann	2015-03-25	3	-10/+6
\| \|
* \|	Remove backward compat in CertifyKeyFragment	Dominik Schürmann	2015-03-25	1	-17/+1
\| \|
* \|	Merge branch 'development' into v/crypto-input-parcel	Dominik Schürmann	2015-03-24	225	-8095/+10159
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
\| *	3.2beta3	Dominik Schürmann	2015-03-23	2	-3/+3
\| \|
\| *	translation fixes	Dominik Schürmann	2015-03-23	8	-113/+93
\| \|
\| *	Fix language problems reported by yahoe.001 on transifex	Dominik Schürmann	2015-03-23	4	-11/+16
\| \|
\| *	Update build env and plugins	Dominik Schürmann	2015-03-23	1	-42/+42
\| \|
\| *	Pull from transifex	Dominik Schürmann	2015-03-23	113	-209/+8859
\| \|
\| *	Remove remaining html entities in changelog	Dominik Schürmann	2015-03-23	1	-3/+3
\| \|
\| *	Merge pull request #1165 from kentnek/dev-yubikey-null	Dominik Schürmann	2015-03-23	1	-5/+11
\| \|\ \| \| \| \| \| \|	Fixed #1152: NullPointerException when signing with YubiKey
\| \| *	Fixed #1152:	Kent	2015-03-20	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \|	- Checking if input.getSignatureSubKeyId() is not null before proceeding.
\| * \|	Merge pull request #1166 from adithyaphilip/multi-threaded	Dominik Schürmann	2015-03-23	25	-122/+691
\| \|\ \ \| \| \| \| \| \| \| \|	Multi-threaded key import, update all feature
\| \| * \|	shifted multi-threading to own service	Adithya Abraham Philip	2015-03-23	21	-334/+611
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
\| \| * \|	introduced multi-threading	Adithya Abraham Philip	2015-03-23	6	-35/+327
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
\| * \| \|	Fix passphrase cache not clearing all passphrases	Dominik Schürmann	2015-03-23	1	-2/+2
\| \| \| \|
\| * \| \|	Merge pull request #1174 from Jesperbk/development	Dominik Schürmann	2015-03-23	1	-1/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Fixed symmetric encryption crash
\| \| * \|	Fixed issue where setting a passphrase to null later causes a ↵	JesperBK	2015-03-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NullPointerException.
\| * \| \|	Markdown comments	Dominik Schürmann	2015-03-23	5	-5/+5
\| \| \| \|
\| * \| \|	Remove changelog in main folder, update comments	Dominik Schürmann	2015-03-23	4	-0/+4
\| \| \| \|
\| * \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-03-23	2	-16/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \| \| \|	Use markdown for in-app help	Dominik Schürmann	2015-03-23	82	-7652/+524
\| \| \|/ / \| \|/\| \|
* \| \| \|	further improve yubikey error handling	Vincent Breitmoser	2015-03-23	5	-24/+78
\| \| \| \|
* \| \| \|	nicer handling of nfc errors	Vincent Breitmoser	2015-03-23	2	-5/+9
\| \| \| \|
* \| \| \|	Merge branch 'development' into v/crypto-input-parcel	Vincent Breitmoser	2015-03-22	2	-16/+25
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	use top line in snackbar for status indication	Vincent Breitmoser	2015-03-22	2	-16/+25
\| \|/ /
* \| \|	fix unit test and add new for divert-to-card promotion	Vincent Breitmoser	2015-03-22	1	-0/+4
\| \| \|
* \| \|	enable nfc in import dialog as well	Vincent Breitmoser	2015-03-22	4	-6/+51
\| \| \|
* \| \|	finish ui flow for yubikey import	Vincent Breitmoser	2015-03-22	9	-221/+396
\| \| \|
* \| \|	actually promote to divert, pass yubikey's AID	Vincent Breitmoser	2015-03-22	6	-31/+24
\| \| \|
* \| \|	improve status reporting in yubikey dialogue	Vincent Breitmoser	2015-03-22	3	-14/+114
\| \| \|
* \| \|	move yubikey import into viewkeyfragment	Vincent Breitmoser	2015-03-22	9	-228/+376
\| \| \|
* \| \|	split up wait/action yubikey fragments	Vincent Breitmoser	2015-03-21	17	-86/+230
\| \| \|
* \| \|	work on ad-hoc yubikey import support	Vincent Breitmoser	2015-03-21	7	-37/+365
\| \| \|
* \| \|	first steps toward yubikey activity	Vincent Breitmoser	2015-03-21	30	-468/+689
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* \| \|	Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel	Vincent Breitmoser	2015-03-21	26	-198/+215
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
\| * \|	Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵	Dominik Schürmann	2015-03-21	25	-203/+184
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	into manojkhannakm-development
\| \| * \|	Added docs for Notify class	Manoj Khanna	2015-03-20	1	-0/+10
\| \| \| \|
\| \| * \|	Fixed Snackbar behind keyboard on ImportKeysActivity	Manoj Khanna	2015-03-20	2	-9/+24
\| \| \| \|
\| \| * \|	Reworked Notify class	Manoj Khanna	2015-03-20	24	-197/+153
\| \| \| \|
\| * \| \|	Add TODO to remote API	Dominik Schürmann	2015-03-21	1	-0/+2
\| \|/ /
\| * \|	Merge pull request #1163 from kentnek/dev-list-footer	Dominik Schürmann	2015-03-20	1	-2/+17
\| \|\ \ \| \| \| \| \| \| \| \|	Added a blank footer view to the list of keys
\| \| * \|	- Added footer so that the Floating Action Button won't block the last few ↵	Kent	2015-03-20	1	-2/+17
\| \| \|/ \| \| \| \| \| \| \| \| \|	items' content
\| * \|	Fix API RESULT_TYPE	Dominik Schürmann	2015-03-20	2	-3/+6
\| \| \|
\| * \|	Fix PASSPHRASE handling in API	Dominik Schürmann	2015-03-20	1	-2/+18
\| \| \|
* \| \|	more data in RequiredInputParcel, OperationResult notifications	Vincent Breitmoser	2015-03-21	7	-36/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()