Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add + button besides TokenAutoComplete, Issue #925 | Durgesh | 2016-04-14 | 1 | -1/+9 |
| | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | Fix string | Dominik Schürmann | 2016-04-13 | 1 | -1/+1 |
| | |||||
* | Merge branch 'backup-code' | Dominik Schürmann | 2016-04-12 | 6 | -69/+1428 |
|\ | |||||
| * | Fix in-app help for backup codes | Dominik Schürmann | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Revert usage of masked-edittext, back to plain edittexts for backup codes | Dominik Schürmann | 2016-04-12 | 5 | -68/+1427 |
| | | |||||
* | | 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 | 8 | -133/+91 |
|\ \ \ | | | | | | | | | Refer to issue #1600 Limit create key options | ||||
| * | | | Redesigned subkey creation dialog and changed default key type created to ↵ | Alex Fong | 2016-04-01 | 8 | -133/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key. | ||||
* | | | | Fix Display Key in UploadKeyActivity, Issue #506 | Durgesh | 2016-03-31 | 2 | -2/+6 |
| | | | | |||||
* | | | | Display Key moved to Fragment | Durgesh | 2016-03-29 | 2 | -2/+9 |
| |/ / |/| | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | | | Final commit | Advaita | 2016-03-23 | 2 | -0/+7 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -148/+25 |
| | | |||||
* | | Add more responsive text sizes | Dominik Schürmann | 2016-03-08 | 2 | -1/+74 |
| | | |||||
* | | Using new size qualifiers | Dominik Schürmann | 2016-03-08 | 4 | -3/+74 |
| | | |||||
* | | Revert "Use non-breaking spaces for backup code MaskedEditText" | Dominik Schürmann | 2016-03-08 | 2 | -4/+0 |
| | | | | | | | | | | | | | | This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java | ||||
* | | Add missing 2 EUR selection for donation | Dominik Schürmann | 2016-03-03 | 1 | -0/+1 |
| | | |||||
* | | Transifex: pt_BR | Dominik Schürmann | 2016-03-03 | 97 | -291/+2893 |
| | | |||||
* | | some changelog for v3.9 | Vincent Breitmoser | 2016-03-02 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #1727 from open-keychain/mime-fallback | Vincent | 2016-02-23 | 2 | -6/+15 |
|\ | | | | | 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 | 2 | -6/+11 |
| | | |||||
| * | 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 |
| | | |||||
* | | Resize QR code properly in landscape orientation | unyoungwax | 2016-02-23 | 1 | -4/+3 |
|/ | |||||
* | Fix landscape orientation | Dominik Schürmann | 2016-02-10 | 1 | -0/+199 |
| | |||||
* | Use non-breaking spaces for backup code MaskedEditText | Dominik Schürmann | 2016-02-10 | 2 | -0/+4 |
| | |||||
* | Backup format v2: redesign restore dialog | Dominik Schürmann | 2016-02-10 | 1 | -88/+10 |
| | |||||
* | Backup format v2: redesigned backup code fragment with masked edit text | Dominik Schürmann | 2016-02-10 | 4 | -1077/+197 |
| | |||||
* | Better transaction animation | Theo Franzén | 2016-02-10 | 10 | -203/+167 |
| | |||||
* | Fix EUR symbol | Dominik Schürmann | 2016-02-10 | 1 | -8/+8 |
| | |||||
* | Add donation fragment | Dominik Schürmann | 2016-02-09 | 1 | -1/+10 |
| | |||||
* | Remove leftovers from spongycastle | Dominik Schürmann | 2016-02-09 | 1 | -1/+1 |
| | |||||
* | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 27 | -27/+27 |
| | |||||
* | Fix number keypad preference | Dominik Schürmann | 2016-02-04 | 1 | -1/+1 |
| | |||||
* | import: handle FileNotFoundException (fixes #1688) | Vincent Breitmoser | 2016-02-01 | 13 | -52/+48 |
| | |||||
* | 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 |
| | |||||
* | forgot to commit a file to previous commit (thanks travis) | Vincent Breitmoser | 2016-01-13 | 1 | -0/+10 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2016-01-13 | 34 | -44/+318 |
| | |||||
* | Add facebook key import to changelog | Dominik Schürmann | 2016-01-12 | 1 | -0/+1 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2016-01-11 | 25 | -0/+300 |
| |