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

Changed phrase "Wazuh server" #4239

Merged
merged 2 commits into from
Jun 13, 2022
Merged

Changed phrase "Wazuh server" #4239

merged 2 commits into from
Jun 13, 2022

Conversation

yenienserrano
Copy link
Member

Description:

Changed the word Manager to Wazuh server from the phrases that appeared in "Deploy a new agent".

Issue:

Test:

  1. Navigate to Agents
  2. Click on 'Deploy new agent'
  3. Complete everything and at the end Wazuh server appears.

Screenshot:

image

@yenienserrano yenienserrano linked an issue Jun 9, 2022 that may be closed by this pull request
@Desvelao Desvelao changed the base branch from master to 4.3-7.10 June 10, 2022 06:00
@Desvelao Desvelao requested a review from a team June 10, 2022 06:01
@Desvelao Desvelao added the UI/UX Generic label for things related to the font-end side label Jun 10, 2022
Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

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

review
code ✔️
test ✔️

@Mayons95
Copy link
Contributor

Test OK
Kibana 7.10.2
Securirty: Xpack
image

@Mayons95 Mayons95 self-requested a review June 10, 2022 18:22
@Desvelao Desvelao merged commit 83e9875 into 4.3-7.10 Jun 13, 2022
@Desvelao Desvelao deleted the 4210-update-phrase branch June 13, 2022 10:05
@github-actions
Copy link
Contributor

The backport to 4.3-1.2-wzd failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.3-1.2-wzd 4.3-1.2-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.3-1.2-wzd
# Create a new branch
git switch --create backport-4239-to-4.3-1.2-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 83e987567101be410a7e0d1ab83e4985499dda37
# Push it to GitHub
git push --set-upstream origin backport-4239-to-4.3-1.2-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.3-1.2-wzd

Then, create a pull request where the base branch is 4.3-1.2-wzd and the compare/head branch is backport-4239-to-4.3-1.2-wzd.

github-actions bot pushed a commit that referenced this pull request Jun 13, 2022
* changed phrase

* add changelog

(cherry picked from commit 83e9875)
Desvelao pushed a commit that referenced this pull request Jun 13, 2022
Changed phrase "Wazuh server" (#4239)

* changed phrase

* add changelog

(cherry picked from commit 83e9875)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Desvelao pushed a commit that referenced this pull request Jun 13, 2022
* changed phrase

* add changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI/UX Generic label for things related to the font-end side
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Redesign of add agent page: page bottom text
3 participants