cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,045 Commits 1 Branch 0 Tags
694d03fb2defa10719aafde9396f33dd7d436370
Commit Graph

69 Commits

Author SHA1 Message Date
Poussinou
94ac78d5ff add badges for fdroid and google play 2017-01-14 18:47:14 +01:00
Dominik Schürmann
0ad0023fac Passphrase dialog: Button to switch between keyboard layouts 2016-07-11 10:55:05 +02:00
Dominik Schürmann
574bb4ff45 Remove old screenshots, move api demo screenshots 2016-01-11 09:22:53 +01:00
Dominik Schürmann
cc917857b0 Advanced screen, warning fragment 2016-01-11 07:42:00 +01:00
Dominik Schürmann
93327dccce Use tor icon for settings screen 2016-01-11 07:39:35 +01:00
Dominik Schürmann
8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Dominik Schürmann
cae76455d4 https everywhere 2015-10-25 22:53:43 +01:00
Dominik Schürmann
74281d6203 Confirm design 2015-09-24 18:30:14 +02:00
Dominik Schürmann
82ee9d440b Use material overflow icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
 2015-09-17 16:24:20 +02:00
Vincent Breitmoser
ff2c552aa2 white share icon in log display activity 2015-09-17 16:17:32 +02:00
Vincent Breitmoser
bbbc8dfd86 multidecrypt: black share icon in bottom sheet 2015-09-17 16:17:17 +02:00
Dominik Schürmann
ce105d955f Add text icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
 2015-09-16 17:21:38 +02:00
Vincent Breitmoser
c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser
2aa424dd4d linked: use link icon from octo set? not sure yet.. 2015-09-01 07:46:37 +02:00
Vincent Breitmoser
66b9c167d6 linked: update icon design of github l-id creation 2015-09-01 07:37:49 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Vincent Breitmoser
6565adc5cc keylist: show delete as icon in multi-select 2015-07-08 15:24:10 +02:00
Dominik Schürmann
0faf69e91f Subtle design improvements to yubikey dialog 2015-07-03 16:54:17 +02:00
Dominik Schürmann
8cd7e29540 New notify icon 2015-06-24 11:35:11 +02:00
moparisthebest
7366f14d32 New all-white status bar icon to fix issue #1356 2015-06-22 22:40:15 -04:00
Vincent Breitmoser
20a6c5ce8a Merge tag 'v3.2.1' into linked-identities 
Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Dominik Schürmann
dbff510783 Add screenshots 2015-05-06 14:22:53 +02:00
Dominik Schürmann
c0c35d383e Update function graphic 2015-05-06 14:03:52 +02:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Vincent Breitmoser
b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +02:00
Dominik Schürmann
baac30508d Graphic stuff 2015-04-17 17:30:03 +02:00
Vincent Breitmoser
dc8b04a793 more linked id ui fine tuning 2015-03-26 16:30:49 +01:00
Vincent Breitmoser
aa6d0dd867 some linked id ui fine tuning 2015-03-26 13:53:43 +01:00
Vincent Breitmoser
04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Vincent Breitmoser
538be96e61 work on certification ui 2015-03-15 22:10:05 +01:00
Dominik Schürmann
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Dominik Schürmann
72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
Dominik Schürmann
c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
Dominik Schürmann
d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann
18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann
7c8f338297 Use material save icon 2015-03-04 20:57:11 +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
jiangkai
57dca38374 if needed change name options.templ.json 2015-03-03 12:30:56 -08:00
jiangkai
ce37b7255d get more material icon script 2015-03-03 10:09:04 -08:00
Dominik Schürmann
b521162ef0 Invoke NFC button 2015-02-25 20:50:34 +01:00
Dominik Schürmann
0931c7742b Other icon for key exchange 2015-02-25 20:20:39 +01:00
Dominik Schürmann
4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +01:00
Dominik Schürmann
fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann
430ba2f777 Bigger status icon in key view 2015-02-25 11:29:46 +01:00
Dominik Schürmann
56d38dd68b First work on new key view toolbar 2015-02-25 02:35:09 +01:00