Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵ | Dominik Schürmann | 2016-04-29 | 1 | -0/+5 |
|\ | | | | | | | LuboViluda-master | ||||
| * | Unnecesary code removed and string repaired | Lubo Viluda | 2016-04-12 | 2 | -4/+3 |
| | | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired | ||||
| * | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 2 | -4/+5 |
| | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified | ||||
| * | #1661 - Don't expose CertifyActivity | Lubo Viluda | 2016-03-20 | 2 | -0/+5 |
| | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity | ||||
* | | Re-enable move-to-card option, improve strings | Dominik Schürmann | 2016-04-29 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #1831 from fiaxh/key_creation_flexible | Dominik Schürmann | 2016-04-29 | 1 | -1/+2 |
|\ \ | | | | | | | Handle user input on key creation more generously | ||||
| * | | Handle user input on key creation more generously | fiaxh | 2016-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825 | ||||
* | | | Fix strings | Dominik Schürmann | 2016-04-18 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #1835 from nmikhailov/check_security_token | Dominik Schürmann | 2016-04-16 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Check security token | ||||
| | * | | | Check if security token keys match required once before signing/decryption | Nikita Mikhailov | 2016-04-16 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 1 | -1/+1 |
|/ / / / | |||||
* / / / | Fix string | Dominik Schürmann | 2016-04-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix string | Dominik Schürmann | 2016-04-13 | 1 | -1/+1 |
| | | | |||||
* | | | Fix strings | Dominik Schürmann | 2016-04-12 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #1772 from runnerway/importkey-encrypted | Vincent | 2016-04-12 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Handle encrypted files in "import key" file selection | ||||
| * | | | Handle encrypted files while importing keys | Andrea Torlaschi | 2016-03-27 | 1 | -0/+1 |
| | | | | |||||
* | | | | Add missing keyholder string param | Nikita Mikhailov | 2016-04-11 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbar | Vincent | 2016-04-06 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | tint linked contact picture in toolbar #1298 | ||||
| * | | | Used a constant instead of magic number for colour | Victor Hazali | 2016-04-04 | 1 | -0/+1 |
| |/ / | | | | | | | | | | Explicitly stated the blending mode | ||||
* | | | Merge pull request #1808 from vhazali/warn-when-stripping-master-key | Vincent | 2016-04-04 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Warn when stripping master key #1554 | ||||
| * | | | Corrected warning message | Victor Hazali | 2016-04-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Corrected capitalisation of subkey | Victor Hazali | 2016-03-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into ↵ | Victor Hazali | 2016-03-30 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |/| | | | | | | warn-when-stripping-master-key | ||||
| | * | | Alert for Stripping Subkeys. | tdjogi010@gmail.com | 2016-03-02 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions | Vincent | 2016-04-04 | 1 | -12/+17 |
|\ \ \ \ | |/ / / |/| | | | Refer to issue #1600 Limit create key options | ||||
| * | | | Redesigned subkey creation dialog and changed default key type created to ↵ | Alex Fong | 2016-04-01 | 1 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key. | ||||
* | | | | Final commit | Advaita | 2016-03-23 | 1 | -0/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | / | Make it a style to reduce code duplication | Dominik Schürmann | 2016-03-08 | 1 | -1/+6 |
| |/ |/| | |||||
* | | Add missing 2 EUR selection for donation | Dominik Schürmann | 2016-03-03 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1727 from open-keychain/mime-fallback | Vincent | 2016-02-23 | 1 | -1/+5 |
|\ | | | | | try to guess if data is text or not | ||||
| * | displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu | Vincent Breitmoser | 2016-02-22 | 1 | -1/+1 |
| | | |||||
| * | mime: try to decode with given charset or utf-8 while file is read | Vincent Breitmoser | 2016-02-22 | 1 | -0/+4 |
| | | |||||
* | | Remove AspectRatioImageView | unyoungwax | 2016-02-23 | 1 | -9/+0 |
|/ | |||||
* | Fix EUR symbol | Dominik Schürmann | 2016-02-10 | 1 | -8/+8 |
| | |||||
* | Add donation fragment | Dominik Schürmann | 2016-02-09 | 1 | -1/+10 |
| | |||||
* | import: handle FileNotFoundException (fixes #1688) | Vincent Breitmoser | 2016-02-01 | 1 | -10/+6 |
| | |||||
* | Handle not installed PGP applet | Theo Franzén | 2016-01-15 | 1 | -0/+9 |
| | |||||
* | Lowercase ttl strings | Dominik Schürmann | 2016-01-14 | 1 | -7/+7 |
| | |||||
* | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 1 | -1/+3 |
| | |||||
* | Advanced screen, warning fragment | Dominik Schürmann | 2016-01-11 | 1 | -7/+6 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -54/+53 |
| | | | | what tokens are supported | ||||
* | inline-ttl: remove "default" setting | Vincent Breitmoser | 2016-01-06 | 1 | -2/+1 |
| | |||||
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 1 | -5/+7 |
| | |||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 2 | -29/+11 |
| | |||||
* | Filinked_empty string | Dominik Schürmann | 2016-01-04 | 1 | -1/+1 |
| | |||||
* | Add change password menu item to view key | Dominik Schürmann | 2015-12-31 | 1 | -0/+1 |
| | |||||
* | Improve linked identity handling | Dominik Schürmann | 2015-12-31 | 1 | -1/+2 |
| | |||||
* | Add edit action to user id card, left align card actions per material design ↵ | Dominik Schürmann | 2015-12-29 | 1 | -1/+1 |
| | | | | guidelines | ||||
* | Fix merge conflicts | Dominik Schürmann | 2015-12-27 | 1 | -2/+0 |
| |