38 Commits

Author	SHA1	Message	Date
Dominik Schürmann	453b67f7a8	Update from transifex	2015-02-28 00:38:53 +01:00
Dominik Schürmann	df7009669b	Pull from transifex	2015-02-22 21:39:34 +01:00
Vincent Breitmoser	7223abcf0c	extend canonicalize to strip local certificates on export	2015-01-02 00:07:05 +01:00
Vincent Breitmoser	9e663237b6	Merge branch 'development' of github.com:open-keychain/open-keychain into development ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml	2014-12-30 13:09:27 +01:00
Vincent Breitmoser	c7b0b650c1	introduce handling of notation direct key signatures, and experimental pin notation packet	2014-12-30 00:44:12 +01:00
Dominik Schürmann	610c4780f1	New work on PIN and lock pattern UI	2014-12-29 23:16:54 +01:00
Dominik Schürmann	5f20abdb26	Pull from transifex	2014-10-26 23:23:30 +01:00
Dominik Schürmann	2eb776594f	Handle revoked and expired keys in decrypt activity	2014-10-08 17:39:53 +02:00
Dominik Schürmann	b573afe235	New decryption screen UI with modernPGP icons	2014-10-08 17:32:32 +02:00
Vincent Breitmoser	d004bf236b	improve CertifyResult, add custom notify	2014-10-04 16:01:24 +02:00
Dominik Schürmann	13cd1daaaa	Pull from transifex	2014-10-03 18:37:56 +02:00
Dominik Schürmann	e1a81ae5cd	Update from transifex	2014-09-30 20:00:14 +02:00
Dominik Schürmann	8b663add04	Pull from transifex	2014-09-24 15:41:00 +02:00
Vincent Breitmoser	e457d4c909	Merge remote-tracking branch 'origin/master' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml	2014-09-15 14:00:17 +02:00
Vincent Breitmoser	9a3a032d99	move LogLevel info into LogType enum	2014-09-15 13:59:21 +02:00
Dominik Schürmann	40751bceb5	Pull from transifex	2014-09-15 10:44:36 +02:00
Dominik Schürmann	980674b322	Pull from transifex	2014-09-08 14:26:10 +02:00
Dominik Schürmann	fe2c17cdeb	Pull from transifex	2014-09-02 14:11:10 +02:00
Vincent Breitmoser	e46bc24079	add cancel support to edit key action	2014-08-31 19:20:08 +02:00
Vincent Breitmoser	5ff3043903	canonicalize: add check for algorithm type ... closes #797	2014-08-30 17:00:58 +02:00
Dominik Schürmann	c2f6aa09c5	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-27 19:28:46 +02:00
Dominik Schürmann	d795f8d4e2	Strip out duplicate user ids	2014-08-27 19:28:33 +02:00
Vincent Breitmoser	cb2eb8aca2	small language fixes for previous commit	2014-08-27 15:42:09 +02:00
Dominik Schürmann	79c4d3ea49	Pull from transifex	2014-08-22 09:54:01 +02:00
Dominik Schürmann	41052d6f8f	Pull from transifex	2014-08-21 00:36:15 +02:00
Dominik Schürmann	70426041df	Pull from transifex	2014-08-20 11:09:41 +02:00
Vincent Breitmoser	de0d95432e	typed expected failures and a couple minor things	2014-08-16 06:53:50 +02:00
Vincent Breitmoser	a943bebfdf	support for master key modifications, among other stuff	2014-08-16 06:53:50 +02:00
Dominik Schürmann	05da0f4328	change keybase hint following pull request #755	2014-08-14 16:20:24 +02:00
Dominik Schürmann	d0987edab9	Dont write version header by default	2014-08-14 11:44:47 +02:00
Dominik Schürmann	d4105420f7	Pull from transifex	2014-08-07 10:01:57 +02:00
Dominik Schürmann	f5f6102458	Pull from transifex	2014-08-04 16:33:05 +02:00
Dominik Schürmann	80f9c769c0	Keyserver exception translateable	2014-07-31 19:05:09 +02:00
Dominik Schürmann	9475285013	Better exception handling for import of keys	2014-07-31 17:11:06 +02:00
Vincent Breitmoser	f4ee71e3ef	introduce EditKeyResult with transient UncachedKeyRing (half-baked!)	2014-07-27 01:22:10 +02:00
Dominik Schürmann	9e56e53cf1	Pull from transifex	2014-07-03 16:30:41 +02:00
Vincent Breitmoser	f38556cab1	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
Dominik Schürmann	6d1369be56	Pull from transifex	2014-05-31 20:49:56 +02:00