diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-08-24 13:35:05 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-08-24 13:35:05 +0530 |
| commit | cbe780f31c64c1f668b35554929c09b8d25f2636 (patch) | |
| tree | d0f24efe53dd9cfee24546bf4bcf89834b528708 | |
| parent | 679037b81dee889bdd3b79bd02c37353df63ccc5 (diff) | |
| parent | 4a4e48dc345cd6110313774b15692e1bd8cceae9 (diff) | |
Merge branch 'release' into backmerge-release
* release:
build: bump version
Add changelog entry for HTTPS authentication
Return HTTPS URI username from CredentialsProvider (#1049)
Prevent racing double commits on password creation (#1047)
Prepare release 1.11.2
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | app/build.gradle.kts | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index dbf2adc0..c3e4118c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,13 @@ All notable changes to this project will be documented in this file. ### Fixed - Password creation UI will scroll if it does not fit on the screen + +## [1.11.2] - 2020-08-24 + +### Fixed + - Saving a password after creating it fails to finish commit operation +- HTTPS authentication did not prompt users for password ## [1.11.1] - 2020-08-21 @@ -314,7 +320,9 @@ All notable changes to this project will be documented in this file. - Fix elements overlapping. -[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.1...HEAD +[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.2...HEAD + +[1.11.2]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.1...1.11.2 [1.11.1]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.0...1.11.1 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 34a5470d..5cb9e9f5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,7 +30,7 @@ android { defaultConfig { applicationId = "dev.msfjarvis.aps" - versionCode = 11111 + versionCode = 11121 versionName = "1.12.0-SNAPSHOT" } |