cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,717 Commits 1 Branch 0 Tags
bfa18dc79e2dc8016dc44eb8cd139d0fbb8d7c56
Commit Graph

1448 Commits

Author SHA1 Message Date
Dominik Schürmann
025eaf0757 Disable hidden recipients for now 2015-03-16 20:34:27 +01:00
Dominik Schürmann
fd8f5ebb2f Allow for hidden recipients in encrypt methods 2015-03-16 18:20:44 +01:00
Dominik Schürmann
a5271bf229 Allow encrypt of filenames via overflow menu 2015-03-16 17:00:53 +01:00
Dominik Schürmann
146fa8d6c0 Clarify certification help screen 2015-03-16 15:05:39 +01:00
Vincent Breitmoser
538be96e61 work on certification ui 2015-03-15 22:10:05 +01:00
Dominik Schürmann
ad9c35f522 Allow selection of none in SelectSignKeyIdActivity 2015-03-15 22:05:12 +01:00
Vincent Breitmoser
4afd6b881e Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-15 20:02:57 +01:00
Dominik Schürmann
fd5719ff6b Remove display of key id in other lists 2015-03-15 18:40:52 +01:00
Dominik Schürmann
f4cb254404 Dont display key ids in KeySpinner, display creation date when user ids duplicate 2015-03-15 15:29:06 +01:00
Vincent Breitmoser
3f844cc70b work on second step of identity creation 2015-03-13 16:30:49 +01:00
Vincent Breitmoser
8fcffdd7cd use ViewAnimator for progress, streamline text on first step 2015-03-13 14:03:27 +01:00
Vincent Breitmoser
a9a5551d95 remove notiion of nonce/identifier 2015-03-13 01:55:31 +01:00
Vincent Breitmoser
b26e57ab19 change finish button label to "link identity" 2015-03-13 01:37:54 +01:00
Vincent Breitmoser
9776957ab1 fix linked wizard buttons 2015-03-12 22:50:22 +01:00
Vincent Breitmoser
163cbb04a0 twitter layout step3 -> step2 2015-03-12 22:35:14 +01:00
Vincent Breitmoser
a5e8825882 finish implementing twitter resource 2015-03-12 20:46:50 +01:00
Dominik Schürmann
dae48e84c8 Improve file deletion strings 2015-03-12 13:18:31 +01:00
Manoj Khanna
bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Vincent Breitmoser
8d71a3fa92 better state management in LinkedIdView, move confirm progress into card 2015-03-10 19:02:51 +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
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
f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Vincent Breitmoser
531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
 2015-03-10 04:56:51 +01:00
Vincent Breitmoser
3b7f21d98a add expand item to linked id list 2015-03-10 04:27:40 +01:00
Dominik Schürmann
b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Vincent Breitmoser
2a42ff016f cleaner handling of verification state 2015-03-10 02:08:51 +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
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Vincent Breitmoser
4db86fdabe Merge remote-tracking branch 'development' into linked-identities 2015-03-10 00:57:23 +01:00
Dominik Schürmann
3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +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
Vincent Breitmoser
ebf3596341 rearrange linked id layouts, add CertListWidget 2015-03-09 21:27:32 +01:00
Vincent Breitmoser
159b197930 add linked id certs uri to KeychainProvider 2015-03-09 21:03:27 +01:00
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
b2e5ac2820 Fix colors for remote activity 2015-03-09 16:55:23 +01:00
Vincent Breitmoser
08fd2a2de3 use loader in LinkedIdViewFragment 2015-03-09 16:30:13 +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
Dominik Schürmann
cf2aa34970 Fix padding in create key 2015-03-09 13:18:21 +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