Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | corrected commit | Ankush | 2014-03-07 | 28 | -85/+85 |
| | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338 | ||||
* | Merge pull request #324 from mb-14/datefix | Dominik Schürmann | 2014-03-05 | 2 | -2/+25 |
|\ | | | | | Expiry selection UI fix | ||||
| * | Merge branch 'master' of ↵ | Miroojin Bakshi | 2014-03-06 | 43 | -590/+1109 |
| |\ | |/ |/| | | | https://github.com/openpgp-keychain/openpgp-keychain into datefix | ||||
* | | Merge pull request #328 from bhargavgolla/patch-1 | Dominik Schürmann | 2014-03-05 | 1 | -1/+20 |
|\ \ | | | | | | | Issue #234 : Adding a min date not to go below creation date | ||||
| * | | Removed log statements as per Dominik's suggestions | Bhargav Golla | 2014-03-05 | 1 | -4/+0 |
| | | | |||||
| * | | Set min date to one day after Created Date. Works on Honeycomb and above | Bhargav Golla | 2014-03-05 | 1 | -4/+25 |
| | | | |||||
| * | | Adding a min date not to go below creation date | Bhargav Golla | 2014-03-04 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #339 from uberspot/master | Dominik Schürmann | 2014-03-05 | 6 | -83/+323 |
|\ \ \ | | | | | | | | | Put Preferences in subscreen | ||||
| * | | | Put Preferences in subscreen | uberspot | 2014-03-05 | 6 | -83/+323 |
| |/ / | |||||
* | | | Merge pull request #336 from Emantor/travis_new_build_tools | Dominik Schürmann | 2014-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update travis to build-tools-19.0.3 | ||||
| * | | | Update travis to build-tools-19.0.3 | Emantor | 2014-03-05 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Updates travis to support pull request #334 | ||||
* | | | Merge pull request #335 from honnel/master | Dominik Schürmann | 2014-03-05 | 22 | -277/+312 |
|\ \ \ | | | | | | | | | updated build.gradle-Files to current Versions of build-tools and SDK. | ||||
| * \ \ | Merge branch 'master' of https://github.com/honnel/openpgp-keychain | Daniel Hammann | 2014-03-05 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * | | | Lint Issue: | Daniel Hammann | 2014-03-05 | 10 | -262/+262 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TypographyEllipsis: Ellipsis string can be replaced with ellipsis character Replace "..." with ellipsis character (…, …) ... -> … | ||||
| * | | | | Lint Issue: | Daniel Hammann | 2014-03-05 | 10 | -263/+263 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | TypographyEllipsis: Ellipsis string can be replaced with ellipsis character Replace "..." with ellipsis character (…, …) ... -> … | ||||
| * | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain | Daniel Hammann | 2014-03-05 | 109 | -2493/+1847 |
| |\| | | |||||
| * | | | Added build-tool and api level version information | Daniel Hammann | 2014-03-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | updated build.gradle-Files to current Versions of build-tools and SDK. | Daniel Hammann | 2014-03-05 | 10 | -12/+12 |
| | | | | |||||
* | | | | Merge pull request #337 from siacs/master | Dominik Schürmann | 2014-03-05 | 2 | -0/+112 |
|\ \ \ \ | |_|/ / |/| | | | added generated ant files | ||||
| * | | | added automaticaly generated ant files | Daniel Gultsch | 2014-03-05 | 2 | -0/+112 |
|/ / / | |||||
* | | | Fix passphrase retrieval | Dominik Schürmann | 2014-03-05 | 1 | -8/+10 |
| | | | |||||
* | | | Code cleaning in PgpDecryptVerify | Dominik Schürmann | 2014-03-04 | 1 | -42/+46 |
| | | | |||||
* | | | Fix license header of key server files | Dominik Schürmann | 2014-03-04 | 2 | -2/+6 |
| | | | |||||
* | | | Remove unused imports | Dominik Schürmann | 2014-03-04 | 1 | -6/+0 |
| | | | |||||
* | | | name KeychainIntentService properly | Dominik Schürmann | 2014-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | Update from transifex | Dominik Schürmann | 2014-03-04 | 8 | -26/+26 |
| | | | |||||
* | | | 2.3.1 beta2 | Dominik Schürmann | 2014-03-04 | 2 | -3/+3 |
| | | | |||||
* | | | Enforce private key for applications, verify signed-only texts without ↵ | Dominik Schürmann | 2014-03-04 | 6 | -163/+267 |
| | | | | | | | | | | | | passphrase input, better internal decrypt and verify method | ||||
* | | | return SIGNATURE_SUCCESS_UNCERTIFIED from service | Dominik Schürmann | 2014-03-04 | 2 | -2/+4 |
| | | | |||||
| | * | Use string from strings.xml | Miroojin Bakshi | 2014-03-06 | 2 | -1/+2 |
| | | | |||||
| | * | Add documentation | Miroojin Bakshi | 2014-03-06 | 1 | -3/+8 |
| | | | |||||
| | * | Hide CalendarView in tablets | Miroojin Bakshi | 2014-03-04 | 1 | -0/+3 |
| | | | |||||
| | * | Extend DatePickerDialog and override setTitle() method. | Miroojin Bakshi | 2014-03-04 | 1 | -1/+12 |
| |/ |/| | |||||
* | | Merge pull request #322 from mj7007/smooth_activity_switch | Dominik Schürmann | 2014-03-04 | 1 | -8/+15 |
|\ \ | | | | | | | Smooth Activity Switch Fixed | ||||
| * | | Smooth Activity Switch Fixed | mj7007 | 2014-03-04 | 1 | -8/+15 |
| | | | |||||
* | | | Merge pull request #315 from jessicayuen/master | Dominik Schürmann | 2014-03-04 | 7 | -11/+87 |
|\ \ \ | | | | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable. | ||||
| * | | | #226: Small fix to prevent message from being sent if IntentService is canceled | Jessica Yuen | 2014-03-03 | 1 | -0/+16 |
| | | | | |||||
| * | | | #226: Async key gen task is stopped if progress is canceled | Jessica Yuen | 2014-03-02 | 5 | -17/+40 |
| | | | | |||||
| * | | | #226: Activity no longer closes if progress is canceled for key creation in ↵ | Jessica Yuen | 2014-03-02 | 5 | -10/+17 |
| | | | | | | | | | | | | | | | | EditKeyActivity | ||||
| * | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵ | Jessica Yuen | 2014-03-02 | 6 | -9/+39 |
| | | | | | | | | | | | | | | | | cancelable. | ||||
* | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-03 | 6 | -11/+17 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #319 from Emantor/lint_fix | Dominik Schürmann | 2014-03-03 | 6 | -11/+17 |
| |\ \ \ \ | | | | | | | | | | | | | Fix Lint ScrollViewSize, DefaultLocale Warnings and NewApi errors | ||||
| | * | | | | Fix NewApi Lint Errors | Emantor | 2014-03-03 | 3 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing ; import android.annotation.TargetApi where needed | ||||
| | * | | | | Fix DefaultLocale Lint Warnings | Emantor | 2014-03-03 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | Fix ScrollViewSize Lint Warnings | Emantor | 2014-03-03 | 3 | -6/+6 |
| | | | | | | |||||
* | | | | | | change ordering in Intent descriptions for better readability in small dialogs | Dominik Schürmann | 2014-03-03 | 1 | -4/+4 |
|/ / / / / | |||||
* | | | | | Put build status on top | Dominik Schürmann | 2014-03-03 | 1 | -5/+4 |
| | | | | | |||||
* | | | | | README link updated | Dominik Schürmann | 2014-03-03 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Put api docs into wiki | Dominik Schürmann | 2014-03-03 | 1 | -57/+9 |
| | | | | | |||||
* | | | | | Add travis status icon to README | Dominik Schürmann | 2014-03-03 | 1 | -0/+2 |
| | | | | |