moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
4,139 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

144 Commits

Author SHA1 Message Date
Dominik Schürmann cb3425f947 Update spongycastle 2014-07-27 18:21:39 +02:00
Dominik Schürmann dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Vincent Breitmoser 043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser 7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Dominik Schürmann 9ea5148550 Update libs 2014-07-25 01:34:57 +02:00
Dominik Schürmann bef3e62111 update lib 2014-07-22 18:30:21 +02:00
Dominik Schürmann 878b5eb5ad Add values for NFC support 2014-07-22 18:10:22 +02:00
Dominik Schürmann 99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00
Dominik Schürmann 976b232946 update nfc lib 2014-07-21 15:11:30 +02:00
Dominik Schürmann d882572f0d NFC Yubikey: only pass through hash of message and not whole content 2014-07-21 15:10:29 +02:00
Vincent Breitmoser cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Dominik Schürmann 3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Dominik Schürmann 69c38c3f34 Update lib 2014-07-17 21:14:42 +02:00
Dominik Schürmann 45611a33fb Update libs 2014-07-17 20:30:41 +02:00
Dominik Schürmann f2a6064e38 Fixes 2014-07-17 20:29:07 +02:00
Dominik Schürmann 3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
Dominik Schürmann e531da4036 Add nfc lib 2014-07-16 10:22:51 +02:00
Vincent Breitmoser d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
 2014-07-06 02:24:34 +02:00
mar-v-in 1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
Dominik Schürmann 931bfdd9df Update spongycastle 2014-07-02 16:56:38 +02:00
Dominik Schürmann 9c1c51bf0c Removed submodule AndroidBootstrap 2014-06-30 22:04:13 +02:00
Dominik Schürmann 97e1f365c2 Update keybase lib 2014-06-28 20:44:01 +02:00
Dominik Schürmann 17aa5d1a90 Fix supertoast submodule 2014-06-28 20:24:02 +02:00
Dominik Schürmann 70bf0c67e1 Update git submodules for android gradle plugin to 0.12.0 2014-06-28 20:17:27 +02:00
Dominik Schürmann b7b22beafc Update subnodule keybase to fixed version of support libs 2014-06-28 18:59:07 +02:00
mar-v-in 6c42fe58bd Add minidns submodule 2014-06-23 21:46:17 +02:00
mar-v-in 2cd4f7eb93 Remove dnsjava module 2014-06-23 21:44:49 +02:00
Dominik Schürmann 012b895e4f Update lib 2014-06-22 12:03:40 +02:00
Tim Bray 1e72f2cba5 Committed submodule 2014-06-21 10:32:11 -07:00
Tim Bray 17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Vincent Breitmoser 3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser 97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Dominik Schürmann fe1b8468a1 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
mar-v-in 36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
Vincent Breitmoser 80779defb1 spongycastle: expose pskr constructor 2014-06-02 18:48:46 +02:00
Dominik Schürmann 638554f256 Update html-textview 2014-05-14 11:02:30 +02:00
Dominik Schürmann be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Dominik Schürmann b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann b817a0a2a8 Update submodules 2014-05-07 17:02:10 +02:00
Dominik Schürmann ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00