cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,805 Commits 1 Branch 0 Tags
bb018b8fc1996ea264771f73da9b3f28550d3b2c
Commit Graph
887 Commits
Author SHA1 Message Date
Manoj Khanna bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
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
Dominik SchürmannandAdithya Abraham Philip 3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +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
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 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
chipset95 e2c502a511 Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 2015-03-09 17:55:46 +05:30
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
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 def4492107 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 11:16:06 +01:00
Vincent 443feef27a Merge pull request #1108 from tdjogi010/development 
Asks Passphrase for key delete/export in ViewKeyActivity.
 2015-03-06 11:10:42 +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 7c2fefe2f7 Added GPLv3 License 2015-03-06 14:47:11 +05:30
tdjogi010@gmail.com 61b306a74a Asks Passphrase for key delete/export in ViewKeyActivity. 2015-03-06 11:50:41 +05:30
chipset95 d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann eaf7e5e005 Fix elevation 2015-03-06 01:12:33 +01:00
Dominik Schürmann 0bb3b9c6cc Format code of merged password strength widget 2015-03-05 23:39:41 +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
Dominik Schürmann e50eda4e29 Use ArrayList instead of LinkedList 2015-03-05 17:59:53 +01:00
Dominik Schürmann aeb0169f02 Use static linked lists instead of arrays 2015-03-05 17:24:56 +01:00
Dominik Schürmann e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann 1576a76ecc Remove false comment in list fragment 2015-03-05 12:53:51 +01:00
Dominik Schürmann 18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +01:00
Dominik Schürmann 8c8fdd6c49 Merge pull request #1101 from danielnelz/development 
#1042 replaced some int constants with enums
 2015-03-04 22:05:55 +01:00
Dominik Schürmann f3af54c814 Show fingerprint menu item only if not revoked or expired 2015-03-04 21:12:52 +01:00
Daniel Nelz fe8b08ac84 #1042 replaced some int constants with enums 
Created enum FragAction in CreateKeyActivity.java and enum State in
KeyFormattingUtils.java and replaced int constants with them
 2015-03-04 21:07:32 +01:00
Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-04 20:54:11 +01:00
Dominik Schürmann 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann b662ff6c49 Get high res version of contact photo 2015-03-04 15:39:41 +01:00
Dominik Schürmann 502a0b5376 Crop image view to center 2015-03-04 15:26:09 +01:00
Dominik Schürmann 2389ce9aeb Full height contact pic in key view 2015-03-04 15:23:33 +01:00