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

4934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Vincent Breitmoser
c1cc27366c move stray test file to correct position 2015-08-29 13:36:35 +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
8a780c9c49 Support OpenPGP API v9 2015-08-28 17:46:57 +02:00
Dominik Schürmann
faf23e4655 Merge branch 'mgeier63-master' 2015-08-28 17:30:52 +02:00
Dominik Schürmann
76522d90fa Cleanup OpenPgpService2 code, update openpgp-api lib 2015-08-28 17:14:40 +02:00
Dominik Schürmann
b5b3ba0c7b Revert "service side support for https://github.com/open-keychain/openpgp-api/pull/3" 
This reverts commit 298e42d3aa.
 2015-08-28 17:08:50 +02:00
Dominik Schürmann
2569984601 Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeier63-master 2015-08-28 17:08:10 +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
55a150ea46 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-28 04:20:50 +02:00
Dominik Schürmann
2ad39c27d9 Collapsing Toolbar 2015-08-28 04:20:43 +02:00
Vincent Breitmoser
79a519aba9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 23:58:01 +02:00
Dominik Schürmann
1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Vincent Breitmoser
5acdef6551 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 16:34:17 +02:00
Vincent Breitmoser
e7991e8dc8 use nicer filenames during export 2015-08-27 16:34:08 +02:00
Vincent Breitmoser
9e3c041549 some cleanup in FileHelper, and allow input of filename during export 2015-08-27 16:13:32 +02:00
Dominik Schürmann
3f4150e4ef Fix theme setting 2015-08-27 15:58: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
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Dominik Schürmann
ec7a3a7047 Experimental feature setting 2015-08-27 12:24:37 +02:00
mgeier63
298e42d3aa service side support for https://github.com/open-keychain/openpgp-api/pull/3 2015-08-27 09:15:33 +02:00
mgeier63
d3bda96953 service side support for https://github.com/open-keychain/openpgp-api/pull/3 2015-08-27 09:12:21 +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
b3ed33c1c7 Merge pull request #1501 from open-keychain/multi-thread-fix 
Fixed crash during "update all"
 2015-08-24 02:38:55 +02:00
Dominik Schürmann
1144ebb94c API: Fix get sign key, related to OpenPgpKeyPreference bugs 2015-08-24 02:37:26 +02:00
Adithya Abraham Philip
d6f3fb4e18 fixed update all crash 2015-08-24 05:59:17 +05:30
Dominik Schürmann
db5040a061 Update openpgp-api-lib 2015-08-24 01:12:51 +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
e3d1f68e79 trigger indexing of file after operation (#1498) 2015-08-22 12:54:19 +02:00
Vincent Breitmoser
16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +02:00
Dominik Schürmann
5e2f24520b Merge pull request #1461 from open-keychain/keyserver-sync 
Periodic Keyserver Sync
 2015-08-20 17:55:55 +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