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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	test and fix: adding an empty user id should fail	Vincent Breitmoser	2014-07-26	4	-1/+20
\|/ /
* \|	forgot to move test classpath out of root project	Vincent Breitmoser	2014-07-21	4	-7/+15
\| \|
* \|	Update README.md	Dominik Schürmann	2014-07-19	1	-2/+2
\| \|
* \|	Update README.md	Dominik Schürmann	2014-07-19	1	-4/+1
\| \|
* \|	Update README	Dominik Schürmann	2014-07-19	1	-4/+7
\| \|
* \|	canonicalize: fix for tests	Vincent Breitmoser	2014-07-19	6	-5/+11
\| \|
* \|	test: start with UncachedKeyRing.canonicalize tests	Vincent Breitmoser	2014-07-19	2	-8/+127
\| \|
* \|	use jacoco for test coverage	Vincent Breitmoser	2014-07-19	1	-0/+24
\| \|
* \|	work on test prepare script, make the whole thing optional	Vincent Breitmoser	2014-07-18	5	-17/+34
\| \|
* \|	Merge branch 'da-kid-master'	Dominik Schürmann	2014-07-18	6	-2/+43
\|\ \
\| * \|	Merge branch 'master' of https://github.com/da-kid/open-keychain into ↵	Dominik Schürmann	2014-07-18	6	-2/+43
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	da-kid-master Conflicts: OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
\| * \|	Fixed gitmodules	Daniel Albert	2014-07-17	1	-2/+2
\| \| \|
\| * \|	Fixed another unescaped apostrophe.	Daniel Albert	2014-07-17	1	-1/+1
\| \| \|
\| * \|	Fixed unescaped apostrophe	Daniel Albert	2014-07-17	1	-1/+1
\| \| \|
\| * \|	Added description to Setting, Changed title to suggested one	Daniel Albert	2014-07-17	2	-3/+5
\| \| \|
\| * \|	Hopefully fixes Travis build errors	Daniel Albert	2014-07-16	1	-2/+2
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/master'	Daniel Albert	2014-07-16	68	-1093/+3342
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
\| * \| \|	Final Commit for #662	Daniel Albert	2014-07-16	1	-1/+6
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into feature-conceal-software	Daniel Albert	2014-07-13	4	-10/+225
\| \|\ \ \
\| * \| \| \|	Added Preference for concealing the PgpApplication	Daniel Albert	2014-07-12	5	-0/+34
\| \| \| \| \|
* \| \| \| \|	Removed OpenPGP-haskell submodule	Dominik Schürmann	2014-07-18	2	-4/+1
\| \| \| \| \|
* \| \| \| \|	Add OpenPGP-Haskell test files directly	Dominik Schürmann	2014-07-18	95	-1/+48
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Temporary program flow fixes	Dominik Schürmann	2014-07-16	1	-0/+3
\| \| \| \|
* \| \| \|	Simple create key	Dominik Schürmann	2014-07-16	1	-1/+0
\| \| \| \|
* \| \| \|	Simple create key	Dominik Schürmann	2014-07-16	3	-51/+57
\| \| \| \|
* \| \| \|	New first time screen	Dominik Schürmann	2014-07-16	17	-681/+713
\| \| \| \|
* \| \| \|	Fallback if no primary user id exists	Dominik Schürmann	2014-07-16	11	-13/+34
\| \| \| \|
* \| \| \|	move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)	Vincent Breitmoser	2014-07-15	9	-22/+21
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-15	1	-1/+1
\|\ \ \ \
\| * \| \| \|	signatures: a revocation reason does NOT determine if a cert is a revocation ↵	Vincent Breitmoser	2014-07-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	type
* \| \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-15	4	-3/+9
\|\\| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into external-test	Vincent Breitmoser	2014-07-15	1	-2/+4
\| \|\ \ \ \
\| * \| \| \| \|	merge: different msg if nothing was merged	Vincent Breitmoser	2014-07-15	4	-3/+9
\| \| \| \| \| \|
* \| \| \| \| \|	some fixes for edit	Dominik Schürmann	2014-07-15	2	-4/+5
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Update README with build instructions for build	Dominik Schürmann	2014-07-15	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Merge pull request #711 from open-keychain/external-test	Vincent	2014-07-15	43	-327/+2507
\|\\| \| \| \| \| \|_\|/ / \|/\| \| \|	External test + working SaveKeyringParcel
\| * \| \|	Merge remote-tracking branch 'origin/master' into external-test	Vincent Breitmoser	2014-07-15	6	-23/+380
\| \|\ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
* \| \| \|	Fix strings from 'keys' to 'passphrases'	Dominik Schürmann	2014-07-12	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:open-keychain/open-keychain	Dominik Schürmann	2014-07-12	4	-16/+158
\|\ \ \ \
\| * \ \ \	Merge pull request #713 from da-kid/master	Dominik Schürmann	2014-07-12	4	-16/+158
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Added notification to passphrasecache
\| \| * \| \| \|	Fixed misplaced bracket	Daniel Albert	2014-07-12	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Wello there, That's Java, not C^^	Daniel Albert	2014-07-12	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Fixed issues discussed in #713	Daniel Albert	2014-07-12	3	-14/+15
\| \| \| \| \|
\| \| * \| \|	Put text into strings.xml, for internationalization	Daniel Albert	2014-07-12	2	-6/+12
\| \| \| \| \|
\| \| * \| \|	Added Purging for Android < 4.1	Daniel Albert	2014-07-12	1	-28/+51
\| \| \| \| \|
\| \| * \| \|	Implemented Notification, no fallback yet	Daniel Albert	2014-07-12	3	-7/+83
\| \| \| \| \|
\| \| * \| \|	new PassphraseCache, storing UserIDs as well	Daniel Albert	2014-07-12	1	-11/+47
\| \|/ / /
* / / /	more work on edit key	Dominik Schürmann	2014-07-12	2	-7/+222
\|/ / /
\| * \|	test: use random string as passphrase	Vincent Breitmoser	2014-07-13	2	-20/+37
\| \| \|
\| * \|	test: add UncachedKeyringTest, stub	Vincent Breitmoser	2014-07-13	1	-0/+105
\| \| \|