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

3641 Commits

Author SHA1 Message Date
Dominik Schürmann fda01143e0 Fix travis 2014-12-05 00:27:33 +01:00
Dominik Schürmann 584ba94f20 Fix travis 2014-12-05 00:13:38 +01:00
Dominik Schürmann b4c5337624 Fix travis 2014-12-04 23:37:57 +01:00
Dominik Schürmann 26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann ac1cbad3ff Switch from mavenCentral to jcenter 2014-12-04 20:02:06 +01:00
Dominik Schürmann 9df7147c8b Fix jacoco 2014-12-04 19:58:08 +01:00
Dominik Schürmann 6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann 389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann 8f5295f2d1 Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version anymore, jacoco disabled for now 2014-12-04 19:42:30 +01:00
Dominik Schürmann 450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
Dominik Schürmann e41dcd3795 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
Dominik Schürmann d50213e0b0 Update for Android Studio 1.0 RC 2014-12-04 19:05:17 +01:00
Dominik Schürmann a278382c28 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-12-04 19:02:58 +01:00
Dominik Schürmann 07619b536a Update for Android Studio 1.0 RC 2014-12-04 19:02:50 +01:00
Dominik Schürmann be694f6243 Update for Android Studio 1.0 RC 2014-12-04 18:57:09 +01:00
Dominik Schürmann 4a9e3ccc83 Merge pull request #1011 from cketti/fix_k9_references 
Fix spelling of 'K-9 Mail' in FAQ
 2014-11-27 11:25:34 +01:00
cketti aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Tim Bray 2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Tim Bray 734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2014-11-21 19:45:35 -08:00
Tim Bray e72c082acd Add check that proof & database fingerprints are the same 2014-11-21 19:44:05 -08:00
Dominik Schürmann 9c133d343f fix signature check 2014-11-22 02:55:42 +01:00
Dominik Schürmann bbbc45e4e9 Dont accept signatures by expired or revoked subkeys 2014-11-22 00:29:14 +01:00
Dominik Schürmann fd60d49d26 Use master key id for keybase proof verification 2014-11-22 00:10:15 +01:00
Dominik Schürmann 47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +01:00
Dominik Schürmann a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Tim Bray 629d83a1ce Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs 2014-11-19 14:37:06 -08:00
Tim Bray b5cdeb7f5a Prevent multiple cloud-trust-search launches. Handle DNS query failure gracefully. Fixes #1007 & #1008. 2014-11-19 14:35:05 -08:00
Dominik Schürmann 1c0f994d08 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-11-19 22:22:18 +01:00
Tim Bray 0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Dominik Schürmann 6691f5118a Version 3.2beta1 2014-11-18 19:04:16 +01:00
Dominik Schürmann ebd3876cbe Update libs 2014-11-18 18:57:28 +01:00
Dominik Schürmann 4dab361b1b Merge branch 'timbray-development' into keybase-proofs 2014-11-12 07:32:20 +01:00
Tim Bray 36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray 3c19e6cfc1 Fix a no-result corner case, and make verifications clickable 2014-11-07 21:07:10 -08:00
Tim Bray 4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann a798d95411 Update keybase and minidns libs 2014-11-04 18:16:42 +01:00
Dominik Schürmann 9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann 602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann 9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Dominik Schürmann f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann 148c9a5c62 Revert "Version 3.1.1" 
This reverts commit 8461f953f6.
 2014-10-30 12:54:01 +01:00
Dominik Schürmann 8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00