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

728 Commits

Author SHA1 Message Date
Dominik Schürmann
ed82c362e6 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-04-18 07:31:38 +02:00
Dominik Schürmann
15ed1c9a63 Fix delete_fail 2016-04-18 07:31:31 +02:00
Dominik Schürmann
b9df34468b Merge pull request #1835 from nmikhailov/check_security_token 
Check security token
 2016-04-16 11:50:23 +02:00
Nikita Mikhailov
a87c65c3f4 Check if security token keys match required once before signing/decryption 2016-04-16 11:13:57 +06:00
Dominik Schürmann
f1b14d338c Fix string 2016-04-16 00:51:31 +02:00
Dominik Schürmann
ab323bddab Fix string 2016-04-13 17:00:24 +02:00
Dominik Schürmann
ff9226c25c Fix strings 2016-04-12 16:15:07 +02:00
Vincent
b55c505054 Merge pull request #1772 from runnerway/importkey-encrypted 
Handle encrypted files in "import key" file selection
 2016-04-12 10:13:30 +02:00
Nikita Mikhailov
8476999922 Add missing keyholder string param 2016-04-11 00:02:05 +06:00
Vincent
77678886fc Merge pull request #1808 from vhazali/warn-when-stripping-master-key 
Warn when stripping master key #1554
 2016-04-04 11:37:50 +02:00
Vincent
e0463ec818 Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions 
Refer to issue #1600 Limit create key options
 2016-04-04 10:53:11 +02:00
Alex Fong
cb9bdb3cf7 Redesigned subkey creation dialog and changed default key type created to RSA, 3072 bit. 
Added code to prevent removal of master subkey when modifying a new key.
 2016-04-01 23:12:11 +08:00
Victor Hazali
8673777ae5 Corrected warning message 2016-04-01 10:34:27 +08:00
Victor Hazali
705a55a7a3 Corrected capitalisation of subkey 2016-03-30 06:09:13 +08:00
Victor Hazali
8ac7115f22 Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key 2016-03-30 05:33:11 +08:00
Andrea Torlaschi
360b5a658a Handle encrypted files while importing keys 2016-03-27 18:20:29 +02:00
Advaita
cab3fa7874 Final commit 
All changes included

Improvements

-Reformatted code wherever required
-Only active wifi connections trigger events
-Improve sync reliability
-Removed extra permission

Minor Changes

-Refactored 2 variables for easier readbility
-Wifi-Only-Sync is now enabled by default
 2016-03-23 20:54:10 +05:30
Dominik Schürmann
1cbecb1b3b Add missing 2 EUR selection for donation 2016-03-03 15:18:31 +01:00
tdjogi010@gmail.com
05accb4906 Alert for Stripping Subkeys. 2016-03-02 02:51:25 +05:30
Vincent Breitmoser
4df63ccdeb displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu 2016-02-22 22:22:45 +01:00
Vincent Breitmoser
bdae99c084 mime: try to decode with given charset or utf-8 while file is read 2016-02-22 17:03:24 +01:00
Dominik Schürmann
751298a4d8 Fix EUR symbol 2016-02-10 12:34:44 +01:00
Dominik Schürmann
2bf9634fd6 Add donation fragment 2016-02-09 20:48:24 +01:00
Vincent Breitmoser
48dd3d09e6 import: handle FileNotFoundException (fixes #1688) 2016-02-01 15:24:48 +01:00
Theo Franzén
25afe7bc86 Handle not installed PGP applet 2016-01-15 17:14:21 +01:00
Dominik Schürmann
d8235e0013 Lowercase ttl strings 2016-01-14 13:15:29 +01:00
Vincent Breitmoser
e66c27c081 passphrasecache: update defaults, add "forever" setting 2016-01-11 17:30:03 +01:00
Dominik Schürmann
cc917857b0 Advanced screen, warning fragment 2016-01-11 07:42:00 +01:00
Dominik Schürmann
0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Vincent Breitmoser
ae15b5dd0d inline-ttl: remove "default" setting 2016-01-06 16:25:53 +01:00
Vincent Breitmoser
7eafe5d1e8 inline-ttl: support "screen off" in preference 2016-01-06 16:25:50 +01:00
Vincent Breitmoser
1754a88ac3 inline-ttl: create ttl choice customization setting activity 2016-01-06 16:24:12 +01:00
Dominik Schürmann
c249198279 Filinked_empty string 2016-01-04 10:41:43 +01:00
Dominik Schürmann
6fb96ce790 Add change password menu item to view key 2015-12-31 16:29:55 +01:00
Dominik Schürmann
122705c24e Improve linked identity handling 2015-12-31 15:24:56 +01:00
Dominik Schürmann
09410e7f69 Fix merge conflicts 2015-12-27 15:06:02 +01:00
Vincent Breitmoser
aca0cd340b inline-edit: move action mode menu handling int activity 2015-12-27 15:00:14 +01:00
Vincent Breitmoser
00e97586b0 inline subkey editing (wip commit) 2015-12-27 15:00:14 +01:00
Vincent Breitmoser
a041acab65 extend-uid: allow changes to user ids in edit mode 2015-12-27 14:59:50 +01:00
Vincent Breitmoser
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
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
aLIEzTed
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
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
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