cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,816 Commits 1 Branch 0 Tags
f52e4a8c7f6fc62da384fa53b497a42dd0e258c5
Commit Graph
665 Commits
Author SHA1 Message Date
Vincent Breitmoser 8d71a3fa92 better state management in LinkedIdView, move confirm progress into card 2015-03-10 19:02:51 +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ürmannandAdithya Abraham Philip 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ürmannandAdithya Abraham Philip 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 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
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
Vincent Breitmoser 2b5023a75d Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-08 01:49:22 +01:00
Vincent Breitmoser 581cad5b3f work on certification step 2015-03-08 00:59:16 +01:00
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
Vincent Breitmoser 6e17d5244d first steps in ui towards confirmation of linked ids 2015-03-06 14:21:13 +01:00
Dominik Schürmann f31ada30d0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 10:50:31 +01:00
chipset95 d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann eaf7e5e005 Fix elevation 2015-03-06 01:12:33 +01:00
Dominik Schürmann 23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
 2015-03-05 23:29:43 +01:00
Vincent Breitmoser a2419aa688 work on LinkedIdViewFragment 2015-03-05 18:05:48 +01:00
Vincent Breitmoser 5d2c81d715 make linked identity list homogeneous 2015-03-05 13:13:43 +01:00
Vincent Breitmoser 7b3bc4ca98 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-05 12:10:51 +01:00
Dominik Schürmann 18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Vincent Breitmoser 1f324be243 do a TON of UI work 2015-03-05 01:58:36 +01:00
Dominik Schürmann 484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann 502a0b5376 Crop image view to center 2015-03-04 15:26:09 +01:00