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

427 Commits

Author SHA1 Message Date
Vincent Breitmoser
3edf47c5de secret/public distinction in LinkedIdView 2015-03-24 19:47:54 +01:00
Vincent Breitmoser
e573cd774a work on cookie scanning during creation 2015-03-24 16:41:01 +01:00
Vincent Breitmoser
f9ef1160ca Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-24 15:29:58 +01:00
Vincent Breitmoser
b25371fc1b support github resource (re) 2015-03-24 02:30:39 +01:00
Vincent Breitmoser
94dbeaeaf0 support github resource (pa) 2015-03-24 01:52:54 +01:00
Dominik Schürmann
98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +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
Vincent Breitmoser
538be96e61 work on certification ui 2015-03-15 22:10:05 +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
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
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
Dominik Schürmann
58d066a54e Pull from transifex 2015-03-10 16:19:46 +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
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
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
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
c50dceab32 Improve icons 2015-03-09 13:27:24 +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
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
30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Dominik Schürmann
d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann
3bc3e3e6f4 Check for insecure hash and symmetric encryption algos on decrypt 2015-03-05 17:46:43 +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
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
Dominik Schürmann
0706bca8c6 Rewording secret_key_deletion_confirmation 2015-03-04 21:14:37 +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
17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Vincent Breitmoser
8222315dbd work more on separation of linked identities and resources, initial ui work 2015-03-04 12:30:56 +01:00
Dominik Schürmann
9b565f1875 More simplification of delete strings 2015-03-04 11:44:37 +01:00
Dominik Schürmann
71db34ed75 Simplify certify strings 2015-03-04 11:40:12 +01:00
Dominik Schürmann
aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
Dominik Schürmann
7b0e067f63 Fix expiry dialog, reorder layouts 2015-03-03 22:44:32 +01:00
Vincent Breitmoser
8bec183eda add linked it to view key context menu 2015-03-02 19:05:52 +01:00
Vincent Breitmoser
e6af789bf5 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
 2015-03-02 18:34:51 +01:00
Adithya Abraham Philip
c2c8ee1efd Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-03-02 22:31:13 +05:30