Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflicts - Merge master into develop #4200

Closed
wants to merge 82 commits into from
Closed

Conversation

pavish
Copy link
Member

@pavish pavish commented Jan 28, 2025

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the develop branch of the repository
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Anish9901 and others added 30 commits January 17, 2025 23:07

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Co-authored-by: zack <6351754+zackkrida@users.noreply.github.com>
…th_variables

Identify i18n translate function calls made with variables instead of strings
Fix 500 on /auth/login route after password change
seancolsen and others added 25 commits January 27, 2025 21:41
…ons_020

Update uninstall instructions for 0.2.0
…_docs

Reorganize usage data collection setting and docs
…cratch_upgrades

Fix install from scratch instructions, improve upgrade instructions
Remove incorrect docker-compose commands to login to db for installation from scratch
@pavish pavish enabled auto-merge January 28, 2025 18:26
@pavish pavish disabled auto-merge January 28, 2025 18:26
@pavish
Copy link
Member Author

pavish commented Jan 28, 2025

We have an action that opened up #4199 automatically. Closing this PR.

@pavish pavish closed this Jan 28, 2025
@kgodey kgodey added this to the v0.2.0 (beta release) milestone Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants