Commit Graph
1341 Commits
Author SHA1 Message Date
Dominik Schürmann 3f70511708 Add edit action to user id card, left align card actions per material design guidelines 2015-12-29 21:21:11 +01:00
Dominik Schürmann ea3b258469 use correct white add icon 2015-12-28 15:41:36 +01:00
Dominik Schürmann 09410e7f69 Fix merge conflicts 2015-12-27 15:06:02 +01:00
Vincent BreitmoserandDominik Schürmann aca0cd340b inline-edit: move action mode menu handling int activity 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann 69220cb4c0 inline subkey editing, fixed 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann 00e97586b0 inline subkey editing (wip commit) 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann fd119bda00 extend-uid: use FAB instead of extra list item 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 4ec51fcd9f extend-uid: button and list to add user ids 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann a041acab65 extend-uid: allow changes to user ids in edit mode 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 5b6bc24a0c extend-uid: add option icon for edit action mode 2015-12-27 14:59:33 +01:00
Dominik Schürmann 6f74ba2f2d Fix some strings thanks to Alain-Olivier 2015-12-27 14:52:09 +01:00
Dominik Schürmann b523db2660 Remove unused layout 2015-12-22 14:07:42 +01:00
Dominik Schürmann 55479834ad Remove unused layout 2015-12-22 14:06:00 +01:00
Dominik Schürmann cb365e450b Backup: Move FAQ button to last screen and simplify code 2015-12-22 11:51:53 +01:00
Dominik Schürmann dc2c4606e2 Update FAQ from website 2015-12-22 11:30:16 +01:00
Dominik Schürmann e08b2612e5 Improve how_to_import 2015-12-22 11:24:59 +01:00
Dominik Schürmann c9487b90f1 Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaLIEz-master 2015-12-22 11:19:38 +01:00
aLIEzTedandTedaLIEz 5aec8b409f Issue #1595
link to faq

link to app

Issue #1595

Issue#1595

Revert commits

Sorry for overhead annotation
2015-12-22 17:36:28 +08:00
Dominik Schürmann ae9a96bfad Default for theme setting 2015-12-22 02:04:02 +01:00
Dominik Schürmann 7e9ce855df Add hint to encrypt field 2015-12-22 01:52:47 +01:00
Adithya Abraham Philip f29280bbb2 added Facebook links support, reworked Preferences 2015-12-06 00:46:52 +05:30
Dominik Schürmann a5fedb2525 Pull from transifex 2015-11-24 00:03:17 +01:00
Dominik Schürmann 2f84561c19 3.7 changelog 2015-11-23 23:59:36 +01:00
Dominik Schürmann 298043f708 Pull from transifex 2015-11-23 23:54:04 +01:00
Dominik Schürmann c4f11c4535 Fix strings, thanks to Alain-Olivier 2015-11-23 23:39:56 +01:00
Dominik Schürmann 01b89d1d9c Revert "Add first time wizard for sync settings"
This reverts commit cd601988db.
2015-11-23 23:25:56 +01:00
Dominik Schürmann cd601988db Add first time wizard for sync settings 2015-11-23 10:46:32 +01:00
Dominik Schürmann c5bcbce28f Show notification when READ_CONTACTS permission is denied in sync service, hide linked contact card if permission is denied 2015-11-23 09:06:12 +01:00
Dominik Schürmann dc631e5c15 Request contact permission in settings for contact linking 2015-11-23 01:21:09 +01:00
Dominik Schürmann 562c0546c6 Handle denied storage permission, use ContentResolver.SCHEME_FILE constant 2015-11-19 18:26:06 +01:00
Vincent d4c121c2af Merge pull request #1543 from rohands/issue_mouseover_hints
mouseover hints
2015-11-16 03:10:02 +01:00
Vincent Breitmoser b0cb0346c1 Merge branch 'master' into v/decrypt-key-lookup 2015-11-15 03:16:46 +01:00
Vincent Breitmoser 529b9518c1 decrypt: skip all encountered marker packets (fix #1582) 2015-11-15 01:01:09 +01:00
Vincent Breitmoser 2d7dada888 decrypt: skip unavailable and unsuitable keys 2015-11-13 16:58:26 +01:00
Dominik Schürmann d6a1be825c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-08 20:02:54 +01:00
Dominik Schürmann 2f640980dd Cleanup settings activity 2015-11-08 19:29:51 +01:00
Vincent Breitmoser 33e8699be5 bench: add simple s2k benchmark (iterations for 100ms) 2015-11-04 21:27:24 +01:00
Vincent Breitmoser 0a266cdb4a bench: run ops multiple times and for an average time 2015-11-04 20:44:35 +01:00
Vincent Breitmoser 3ca8af060b Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-04 20:24:11 +01:00
Vincent Breitmoser a4518c43c2 bench: simple working benchmark 2015-11-04 20:24:06 +01:00
Vincent Breitmoser 8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Dominik Schürmann 8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Dominik Schürmann 59e3122731 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-02 18:10:05 +01:00
Dominik Schürmann 05df0a63b7 Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303 2015-11-02 18:09:41 +01:00
Vincent Breitmoser 3411a5c087 keylist: add "search for query" button to empty view 2015-11-02 15:57:35 +01:00
Vincent Breitmoser a665dd60fb use Proxy.NO_PROXY instead of null value for no proxy 2015-10-29 15:43:16 +01:00
Vincent Breitmoser a1330f78e4 uploadop: clean up, add logging 2015-10-29 14:50:29 +01:00
Dominik Schürmann 67a51cdfe3 Target SDK 23 and related fixes 2015-10-26 20:53:32 +01:00
Dominik Schürmann ddc0315b45 Update android-patternview, materialtabstrip, floatingactionbutton 2015-10-26 20:09:41 +01:00
Dominik Schürmann 96bed5ef1a Update zxing-android-embedded with new custom activity 2015-10-26 19:58:56 +01:00