This repository has been archived by the owner on Oct 15, 2024. It is now read-only.
Sync with release branch #896
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I verified the following: * Store: F-Droid * Package hash: wi2iuVvK/WYZUzd2g0Qzn9ef3kAisQURZ8U1WSMTkcM= * Based on: Firefox * Actively maintained: https://git.savannah.gnu.org/cgit/gnuzilla.git/log/?h=68 * Multi-origin method: WebView * Save support: no (cherry picked from commit 8a90ba4) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 6b5984d) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Use remembered credential even if it is empty Should fix #875. * .isNull() --> == null * Update relnotes Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * Reword relnotes Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> * 2019 it is Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> Co-authored-by: Harsh Shandilya <me@msfjarvis.dev> (cherry picked from commit b60c5fb) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 889208b) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Revert "github: run instrumentation tests against API 30 (#847)" API 30 is too flaky to be a part of our active test suite. This reverts commit bf33fb2. * github: bump android-emulator-runner action Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> (cherry picked from commit eb31385) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* release: build: bump version Prepare release 1.9.1 Backport Actions fixes (#894) Remove API 30 from pull request test matrix (#879) CHANGELOG: reword to better clarify fixes Prevent cached passwords from being wiped (#884) Use remembered credential even if it is empty (#880) Reset SSH passphrase after SSH key import (#885) Add relnotes for #871 (#872) Add org.gnu.icecat as a trusted multi-origin browser (#871) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
fmeum
approved these changes
Jun 28, 2020
|
Branch protection disallows merge commits so guess we're just squashing this in. |
Between this and and the non-regex weirdness, we probably want separate branch protection rules for develop and release (and no other branch). |
|
I switched on rebase merge and made the pattern specific enough to not match the |
msfjarvis
added a commit
to fmeum/Android-Password-Store
that referenced
this pull request
Jul 1, 2020
* develop: (62 commits) Scroll to files and enter folders when created (android-password-store#909) Run a treewide reformat (android-password-store#908) Improve how secrets and stored and used (android-password-store#907) Improve and refactor Autofill heuristics (android-password-store#905) Use PreferenceKeys file to manage SharedPreferences keys. (android-password-store#891) Revert "Support directly importing secrets" (android-password-store#904) Allow importing TOTP configuration through QR codes (android-password-store#903) Bump version Prepare release 1.9.2 update changelog Workaround to prevent crash on first run (android-password-store#898) Workaround to prevent crash on first run (android-password-store#898) Offer TOTP Autofill for OTP fields (android-password-store#899) Merge SshKeyGenFragment into its activity (android-password-store#897) Reintroduce TOTP support (android-password-store#890) Sync with release branch (android-password-store#896) build: bump version Prepare release 1.9.1 Backport Actions fixes (android-password-store#894) Rework GitHub Actions (android-password-store#893) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📢 Type of change
📜 Description
Merge back release into develop to ensure the histories for both branches are compatible with each other, as well as bringing the changelog in sync to ensure future backporting is straightforward.
Squashing this into develop will nullify the value of doing these merges so this should be submitted by checking out develop, fast-forwarding this branch into it, then pushing that updated branch to the repository.