cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,063 Commits 1 Branch 0 Tags
4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0
Commit Graph

1234 Commits

Author SHA1 Message Date
Vincent Breitmoser
36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Vincent Breitmoser
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Dominik Schürmann
bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Vincent Breitmoser
e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +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
3c25dc2b0c Improve decrypt strings 2015-08-28 17:47:56 +02:00
Dominik Schürmann
765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +02:00
Dominik Schürmann
905148f586 Add missing scrim drawable 2015-08-28 14:25:20 +02:00
Dominik Schürmann
6fa5f0b129 introduce text protection and fix color change after confirm 2015-08-28 14:22:52 +02:00
Dominik Schürmann
bff9aa1401 Remove old comment 2015-08-28 13:50:12 +02:00
Dominik Schürmann
333ba5d032 Improve scrolling in key view 2015-08-28 13:10:30 +02:00
Dominik Schürmann
0aaa93ac04 Dont show FAB for expired, revoked keys 2015-08-28 11:50:13 +02:00
Dominik Schürmann
20f652350a Improve certify strings 2015-08-28 10:41:45 +02:00
Dominik Schürmann
2ad39c27d9 Collapsing Toolbar 2015-08-28 04:20:43 +02:00
Dominik Schürmann
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Dominik Schürmann
cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Dominik Schürmann
905e738621 Use SwitchPreference more often 2015-08-27 14:05:58 +02:00
Dominik Schürmann
c292b8d9c3 Experimental features settings reworked 2015-08-27 13:59:26 +02:00
Dominik Schürmann
ec7a3a7047 Experimental feature setting 2015-08-27 12:24:37 +02:00
Dominik Schürmann
f92e5f663f fix msg_ip_merge_secret 2015-08-26 15:26:24 +02:00
Dominik Schürmann
5a7f2b2c12 Use CDATA to prevent transifex problems 2015-08-26 15:24:29 +02:00
Dominik Schürmann
1ac4ebfb28 Pull from transifex 2015-08-26 15:08:09 +02:00
Dominik Schürmann
588e84d4b1 Pull from transifex 2015-08-25 19:14:13 +02:00
Dominik Schürmann
f57f5ea032 Better del_rev_dialog_title 2015-08-24 00:49:32 +02:00
Dominik Schürmann
317580039a Better del_rev_dialog_message 2015-08-24 00:48:40 +02:00
Dominik Schürmann
eb381df1fb Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-24 00:37:47 +02:00
Dominik Schürmann
7ba0b93ceb Move proxy pref values out of strings 2015-08-24 00:37:38 +02:00
Vincent Breitmoser
16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +02:00
Adithya Abraham Philip
0251f0e416 introduced constants for keyserver sync, fixed sync issue 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
f625a26bbd added on/off summaries 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
3f8f70b0a9 added sync preferences 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
93d66d39f7 changed orbot notification icons 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
6af24527da changed sync name 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
448657602c improved orbot notify, added periodic sync 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
2ef691b264 Fix theme problems 2015-08-18 11:19:50 +02:00
Dominik Schürmann
2df3335965 Update about 2015-08-17 18:15:04 +02:00
Dominik Schürmann
ed299e22b4 Add additional langs from transifex 2015-08-17 13:23:40 +02:00
Dominik Schürmann
cc2e83c523 Pull from transifex 2015-08-17 13:14:28 +02:00
Dominik Schürmann
95ec041440 Changelog 3.5 2015-08-17 13:11:38 +02:00
Dominik Schürmann
dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Vincent Breitmoser
b2d447ab32 show dummy item if there are no secret keys 2015-08-14 14:47:20 +02:00
Dominik Schürmann
d14e0b2ed3 Fix theme bugs 2015-08-12 20:25:58 +02:00
Dominik Schürmann
0326bbce6b Adpt official theme naming schema 2015-08-12 17:09:07 +02:00
Dominik Schürmann
65517f0d06 Style dialog buttons 2015-08-12 17:00:09 +02:00
Dominik Schürmann
3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Dominik Schürmann
dba145f5df Follow some of coorus recommendations: better selection of algo whitelist, ignore recipients preferred algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann
57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann
3dbe0033dc Merge pull request #1473 from open-keychain/orbot-helper 
Updated OrbotHelper with the latest NetCipher
 2015-08-06 10:34:13 +02:00