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

Merge 4.9.1 into 4.10.0 #322

Merged
merged 5 commits into from
Sep 23, 2024
Merged

Merge 4.9.1 into 4.10.0 #322

merged 5 commits into from
Sep 23, 2024

Conversation

Desvelao
Copy link
Member

Merge 4.9.1 into 4.10.0

Not all commits are done because many do not make changes to 4.10.0 because they are revision and version of 4.9.1 that in 4.10.0 are reset.

Commits list

4abde2652a
6f475373e3
e5fd95625e
4208ce079c
30adcb1ac7
24c454efa8

Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Desvelao Desvelao merged commit 50027fc into 4.10.0 Sep 23, 2024
59 of 61 checks passed
@Desvelao Desvelao deleted the merge-4.9.1-into-4.10.0 branch September 23, 2024 10:12
yenienserrano pushed a commit to yenienserrano/wazuh-dashboard that referenced this pull request Oct 2, 2024
…ensearch-project#6458) (opensearch-project#6580)

* Add workspace filter into saved objects page (wazuh#211)

* Add workspace column/filter into saved objects page

Signed-off-by: Hailong Cui <[email protected]>

fix failed test case

Signed-off-by: Hailong Cui <[email protected]>

move workspace column to its own folder

Signed-off-by: Hailong Cui <[email protected]>

* default workspace

Signed-off-by: Hailong Cui <[email protected]>

fix test case

Signed-off-by: Hailong Cui <[email protected]>

add test case

Signed-off-by: Hailong Cui <[email protected]>

remove hide import

Signed-off-by: Hailong Cui <[email protected]>

* address review comments

Signed-off-by: Hailong Cui <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>

* replace default workspace with public workspace (wazuh#322)

Signed-off-by: Hailong Cui <[email protected]>

* Add workspace filter

Signed-off-by: Hailong Cui <[email protected]>

* revert query params change

Signed-off-by: Hailong Cui <[email protected]>

* udpate test case name to more clear

Signed-off-by: Hailong Cui <[email protected]>

* support public workspace

Signed-off-by: Hailong Cui <[email protected]>

* Add changelog

Signed-off-by: Hailong Cui <[email protected]>

* update fetchExportByTypeAndSearch parameter

Co-authored-by: SuZhou-Joe <[email protected]>
Signed-off-by: Hailong Cui <[email protected]>

* remove virtrual public workspace

Signed-off-by: Hailong Cui <[email protected]>

* update comments

Signed-off-by: Hailong Cui <[email protected]>

* fix public workspace query when permission is not enabled

Signed-off-by: Hailong Cui <[email protected]>

* home dashboards/listing page only show public workspace data

Signed-off-by: Hailong Cui <[email protected]>

* Add more test case

Signed-off-by: Hailong Cui <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Co-authored-by: SuZhou-Joe <[email protected]>
(cherry picked from commit 9408e49)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Tostti added a commit that referenced this pull request Oct 17, 2024
Co-authored-by: Chantal Belén kelm <[email protected]>
Co-authored-by: JuanGarriuz <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
yenienserrano pushed a commit that referenced this pull request Feb 18, 2025
Co-authored-by: Chantal Belén kelm <[email protected]>
Co-authored-by: JuanGarriuz <[email protected]>
Co-authored-by: Federico Rodriguez <[email protected]>
Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]>
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.

Scheduled upward merges for numbered branches in wazuh-dashboard repository - Fortnight #18
4 participants