Commit Graph

3805 Commits

Author SHA1 Message Date
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
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
Dominik Schürmann cc66435e38 Some fixes for delete after encryption 2015-03-09 18:59:15 +01:00
Dominik Schürmann 7c22fc843b Fix ascii armor in encrypt activity 2015-03-09 18:33:20 +01:00
Dominik Schürmann 009e8e9e39 Fix compression check in activities 2015-03-09 18:21:54 +01:00
Dominik Schürmann 3fe7fa202c API: If signature key is known return pi to show key 2015-03-09 17:12:46 +01:00
Dominik Schürmann b2e5ac2820 Fix colors for remote activity 2015-03-09 16:55:23 +01:00
Dominik Schürmann bd1705410a Cleanup new widgets 2015-03-09 16:17:12 +01:00
Dominik Schürmann d8c4867825 Merge pull request #1112 from chipset95/issue-1106-imp
Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
2015-03-09 16:08:45 +01:00
Dominik Schürmann 72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
chipset95 c55353e2b8 Implemented NameEditText 2015-03-09 18:12:44 +05:30
Dominik Schürmann c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
chipset95 e2c502a511 Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 2015-03-09 17:55:46 +05:30
Dominik Schürmann cf2aa34970 Fix padding in create key 2015-03-09 13:18:21 +01:00
Dominik Schürmann 9572327c36 Removed unused PasswordEditText 2015-03-09 12:59:35 +01:00
Dominik Schürmann 80f2822dd8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-09 12:52:17 +01:00
Dominik Schürmann 7ac4f63ea3 Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator
Passphrase strength indicator
2015-03-09 12:51:00 +01:00
Adithya Abraham Philip 820005bc37 minor xml code style correction 2015-03-08 12:57:37 +05:30
Vincent Breitmoser 4f11fb5a2f unit test certification of user attributes 2015-03-08 01:46:31 +01:00
Vincent Breitmoser 30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Adithya Abraham Philip f181a1ecbe minor code style correction 2015-03-07 13:07:28 +05:30
Adithya Abraham Philip 976c40e45f removed created by comment 2015-03-06 22:42:37 +05:30
Adithya Abraham Philip 1de528fc85 cleaned up code 2015-03-06 22:25:35 +05:30
Adithya Abraham Philip f12f6b540d changed default colors for PasswordStrengthView 2015-03-06 22:11:33 +05:30
Adithya Abraham Philip fee891fc06 added PassphraseEditText to SetPassphraseDialogFragment 2015-03-06 22:00:30 +05:30
Adithya Abraham Philip c5093433f5 added PassphraseEditText 2015-03-06 21:32:17 +05:30
Dominik Schürmann 4013a36276 Remove dublicate email check 2015-03-06 11:20:45 +01:00