moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 06:12:20 -05:00
Code Issues Releases Wiki Activity
3,863 Commits 12 Branches 24 Tags
Commit Graph

3863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser
706d339004 regenerate twitter token 2015-03-12 22:09:05 +01:00
Vincent Breitmoser
4adf2b343c small fix for CreateFinalFragment 2015-03-12 22:06:30 +01:00
Vincent Breitmoser
bebd726384 twitter Step3 -> Step2 2015-03-12 21:07:43 +01:00
Vincent Breitmoser
4f31bbff0f ditch custom text step for twitter 2015-03-12 21:03:42 +01:00
Vincent Breitmoser
a5e8825882 finish implementing twitter resource 2015-03-12 20:46:50 +01:00
Vincent Breitmoser
8d71a3fa92 better state management in LinkedIdView, move confirm progress into card 2015-03-10 19:02:51 +01:00
Vincent Breitmoser
f58ab3e439 hack loadSystemContact back in 2015-03-10 05:11:46 +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
Vincent Breitmoser
deafe946fd filter out unknown linked ids 2015-03-10 03:30:20 +01:00
Vincent Breitmoser
f069d9814d minor additions to CertListWidget 2015-03-10 03:29:52 +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
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
Vincent Breitmoser
4db86fdabe Merge remote-tracking branch 'development' into linked-identities 2015-03-10 00:57:23 +01:00
Vincent Breitmoser
f76f84dfb2 concurrency and continuity fixes for verification backstack handling 2015-03-10 00:55:48 +01:00
Vincent Breitmoser
6df9387c2c support backstack for verification 2015-03-09 23:58:05 +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
Vincent Breitmoser
ebf3596341 rearrange linked id layouts, add CertListWidget 2015-03-09 21:27:32 +01:00
Adithya Abraham Philip
012b7e4830 cleaned up code, added comments 
optimised imports
 2015-03-10 01:33:55 +05:30
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
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
Vincent Breitmoser
138773798a fix transition animation 2015-03-09 16:56:10 +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
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
99eb8725e9 successfully certify linked ids 2015-03-08 04:42:19 +01:00