moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-14 21:05:09 -05:00
Code Issues Releases Wiki Activity
3,832 Commits 12 Branches 24 Tags 116 MiB
c2593f29ff
Commit Graph

3832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Dominik Schürmann
6c9b2ce0c0 Add missing license headers 2015-03-15 00:49:29 +01:00
Dominik Schürmann
8ede97b9ff Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-14 21:36:35 +01:00
Dominik Schürmann
f1b1ecae20 Merge pull request #1143 from manojkhannakm/development 
Fix for Issue #1115
 2015-03-14 21:36:28 +01:00
Dominik Schürmann
afa7790fbd disable debug sync 2015-03-14 14:08:03 +01:00
Dominik Schürmann
12734127a7 Use names also for main contact 2015-03-14 14:07:45 +01:00
Dominik Schürmann
cd7f631221 Show key name instead of key id in contacts, cleanup 2015-03-14 14:05:31 +01:00
Dominik Schürmann
23290b9013 Merge pull request #1144 from adithyaphilip/main-profile-keys 
Own keys linked to "me" contact
 2015-03-14 13:40:53 +01:00
Adithya Abraham Philip
d7ef2c1b9e added some documentation 2015-03-13 04:49:34 +05:30
Adithya Abraham Philip
759009ddb4 added own profile support in linekd system contact 2015-03-13 04:04:11 +05:30
Adithya Abraham Philip
d4375b7dfc links own keys to me profile in contacts 2015-03-13 03:13:22 +05:30
Manoj Khanna
5b5e5b4981 Fix for Issue #1115 2015-03-13 00:53:05 +05:30
Dominik Schürmann
b953623802 Clarify logs in DeleteFileDialog 2015-03-12 14:34:58 +01:00
Dominik Schürmann
27027b8ee5 Use notify instead of Toast for NFC check 2015-03-12 13:39:20 +01:00
Dominik Schürmann
67a9f12790 Merge pull request #1133 from Rrego6/development 
Check if NFC is available on device
 2015-03-12 13:38:15 +01:00
Dominik Schürmann
183457334f Merge pull request #1117 from danielnelz/development 
#1042: Replaced ints with enums
 2015-03-12 13:27:04 +01:00
Dominik Schürmann
dae48e84c8 Improve file deletion strings 2015-03-12 13:18:31 +01:00
Dominik Schürmann
4de978bccb Merge pull request #1137 from manojkhannakm/development 
Updated fix for Issue #1116
 2015-03-12 13:11:29 +01:00
Dominik Schürmann
fb1701f09f Merge pull request #1134 from adithyaphilip/sync-confirmed-keys 
Sync only confirmed keys and change
 2015-03-12 13:08:18 +01:00
danielnelz
52200edfd7 Fixed possible ArrayIndexOutOfBoundsException. 2015-03-11 21:32:20 +01:00
Adithya Abraham Philip
08972de68f added contact sync at end of CertifyOperation 2015-03-11 23:11:01 +05:30
Adithya Abraham Philip
45eea9b5b8 corrected linked system contact display name 2015-03-11 23:10:32 +05:30
Vincent Breitmoser
9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Manoj Khanna
bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Dominik Schürmann
82a2a76a33 make constant for certify hash algo 2015-03-11 14:37:23 +01:00
Raoul
471f92a967 Check if NFC is available on device 2015-03-10 22:06:17 -04:00
Dominik Schürmann
4ed1bf0ca4 Version 3.2beta2 2015-03-10 16:30:00 +01:00
Dominik Schürmann
58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann
446e16fc62 Disable maybe methods in ImportKeysListEntry for now 2015-03-10 15:55:19 +01:00
Dominik Schürmann
79a4e7fb9c Fix expiry, revoked checks in OpenPgpSignatureResultBuilder 2015-03-10 15:52:44 +01:00
Dominik Schürmann
0e32b37f9d Changelog 3.2beta1 2015-03-10 15:35:47 +01:00
Dominik Schürmann
7346144ba9 Remove unused NFC Beam html 2015-03-10 15:18:24 +01:00
Dominik Schürmann
686146a871 Update openpgp lib 2015-03-10 15:17:27 +01:00
Dominik Schürmann
8f44500fdf Update api lib 2015-03-10 11:35:12 +01:00
Dominik Schürmann
f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann
b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Dominik Schürmann
ae1c80e8b3 Merge branch 'adithyaphilip-contact-card' into development 2015-03-10 01:52:14 +01:00
Dominik Schürmann
64e85a2eb4 Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card 
Conflicts:
	Graphics/get-material-icons.sh
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
	OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-10 01:51:30 +01:00
Dominik Schürmann
b74fa6c662 Merge pull request #1121 from adithyaphilip/rawcontact-deletion 
Fixed contact deletion Issue #1120
 2015-03-10 01:45:28 +01:00
Dominik Schürmann
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann
3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +05:30
Adithya Abraham Philip
224f243c79 added CALLER_IS_SYNCADAPTER parameter to delete queries 2015-03-10 03:28:12 +05:30
Adithya Abraham Philip
5f0a468d9a changed default drawable for linked system contact 2015-03-10 02:49:34 +05:30
Dominik Schürmann
7d2e2e3eec Make create key wizard step-by-step 2015-03-10 02:49:34 +05:30
Dominik Schürmann
e3547b4979 Show passphrase checkbox in create key 2015-03-09 22:09:48 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Adithya Abraham Philip
012b7e4830 cleaned up code, added comments 
optimised imports
 2015-03-10 01:33:55 +05:30
Adithya Abraham Philip
f8a6f814dd added contact linking 2015-03-10 01:08:09 +05:30
Adithya Abraham Philip
bc43797c32 added card 2015-03-10 01:08:09 +05:30
danielnelz
704821a8db Merge remote-tracking branch 'upstream/development' into development 2015-03-09 20:25:03 +01:00