13 Commits

Author SHA1 Message Date
Dominik Schürmann
a545d50f4b Pull from transifex 2015-04-14 00:40:28 +02:00
Dominik Schürmann
e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann
98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00
Manoj Khanna
bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Dominik Schürmann
58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
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