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

1211 Commits

Author SHA1 Message Date
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
24f2a9468c multidecrypt: display all outputUris as individual items 2015-09-16 02:56:14 +02:00
Vincent Breitmoser
81ce075df9 multidecrypt: prepare viewholder for file list 2015-09-16 02:19:23 +02:00
Vincent Breitmoser
326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +02:00
Vincent Breitmoser
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser
fd6141f0d2 add share item to decrypt file list (#1524) 2015-09-11 04:51:55 +02:00
Vincent Breitmoser
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser
b76aa7fe11 never import secret keys from keyserver (OKC-01-001) 2015-09-11 02:05:17 +02:00
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser
b78954fc16 add support for signed-only data in the backend (#1507) 2015-09-10 21:44:15 +02:00
Vincent Breitmoser
c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +02:00
Vincent Breitmoser
178aea6b90 linked: localization for github creation 2015-09-10 11:46:31 +02:00
Vincent Breitmoser
c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser
bb7efe0ce9 linked: fix button margins in select dialog 2015-09-08 15:51:01 +02:00
Vincent Breitmoser
d2ce770c1a Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-06 00:59:12 +02:00
Vincent Breitmoser
60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +02:00
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04:00
Vincent Breitmoser
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser
87f7fe65a8 linked: fix back button in github dialog 2015-09-01 14:11:04 +02:00
Vincent Breitmoser
19c9fcc2c9 linked: order selection dialog alphabetically 2015-09-01 14:07:04 +02:00
Vincent Breitmoser
6225c940f9 linked: redesign github resource creation, implement ouath flow 2015-09-01 13:58:04 +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
3e55fca0e5 linked: work on github design 2015-09-01 07:09:53 +02:00
Vincent Breitmoser
b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser
9668abfe9e add simple StatusIndicator widget 2015-09-01 06:40:28 +02:00
Vincent Breitmoser
261c83043b linked: Github -> GitHub (fixes #1513) 2015-08-31 14:24:13 +02:00
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