Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
| | |||||
* | inline-edit: move action mode menu handling int activity | Vincent Breitmoser | 2015-12-27 | 1 | -2/+1 |
| | |||||
* | inline subkey editing (wip commit) | Vincent Breitmoser | 2015-12-27 | 1 | -1/+4 |
| | |||||
* | extend-uid: allow changes to user ids in edit mode | Vincent Breitmoser | 2015-12-27 | 1 | -0/+2 |
| | |||||
* | extend-uid: add option icon for edit action mode | Vincent Breitmoser | 2015-12-27 | 1 | -0/+1 |
| | |||||
* | Fix some strings thanks to Alain-Olivier | Dominik Schürmann | 2015-12-27 | 1 | -3/+3 |
| | |||||
* | Improve how_to_import | Dominik Schürmann | 2015-12-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into ↵ | Dominik Schürmann | 2015-12-22 | 1 | -1/+1 |
|\ | | | | | | | TedaLIEz-master | ||||
| * | Issue #1595 | aLIEzTed | 2015-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | link to faq link to app Issue #1595 Issue#1595 Revert commits Sorry for overhead annotation | ||||
* | | Add hint to encrypt field | Dominik Schürmann | 2015-12-22 | 1 | -1/+1 |
| | | |||||
* | | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -0/+3 |
|/ | |||||
* | Fix strings, thanks to Alain-Olivier | Dominik Schürmann | 2015-11-23 | 1 | -26/+26 |
| | |||||
* | Revert "Add first time wizard for sync settings" | Dominik Schürmann | 2015-11-23 | 1 | -1/+1 |
| | | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10. | ||||
* | Add first time wizard for sync settings | Dominik Schürmann | 2015-11-23 | 1 | -1/+1 |
| | |||||
* | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 1 | -0/+2 |
| | | | | hide linked contact card if permission is denied | ||||
* | Request contact permission in settings for contact linking | Dominik Schürmann | 2015-11-23 | 1 | -4/+4 |
| | |||||
* | Handle denied storage permission, use ContentResolver.SCHEME_FILE constant | Dominik Schürmann | 2015-11-19 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1543 from rohands/issue_mouseover_hints | Vincent | 2015-11-16 | 1 | -0/+6 |
|\ | | | | | mouseover hints | ||||
| * | Class names and string names are updated | rohands | 2015-09-22 | 1 | -4/+6 |
| | | |||||
| * | Mousehints | rohands | 2015-09-20 | 1 | -0/+4 |
| | | |||||
* | | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 1 | -1/+0 |
| | | |||||
* | | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 1 | -0/+2 |
| | | |||||
* | | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 1 | -2/+4 |
| | | |||||
* | | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 2 | -4/+5 |
|\ \ | |||||
| * | | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 1 | -0/+1 |
| | | |