Merge frappe master #9
Open
Conversation
This file contains hidden or 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
tanmoysrt
force-pushed
the
master
branch
2 times, most recently
from
460d9fe to
1b360a1
Compare
- Also update incident tests (cherry picked from commit a696eb8)
fix: November fixes 1 (backport #3884)
Reference: https://sentry.frappe.cloud/organizations/frappe/issues/7 (cherry picked from commit 865e5ac)
(cherry picked from commit fb1479a) # Conflicts: # press/api/partner.py
(cherry picked from commit 456b564)
(cherry picked from commit 6e3aac0)
fix(snapshot): Ignore errors while deleting locked snapshots (backport #3881)
fix(prm): Miscellaneous PRM fixes (backport #3901)
(cherry picked from commit 7e08967)
(cherry picked from commit 4a1b8d6)
chore(prm): Change dialog title (backport #3906)
(cherry picked from commit bb68854)
(cherry picked from commit 28455e7)
fix(sentry): Enable Performance Monitoring (backport #3909)
(cherry picked from commit 8e8dbd9)
(cherry picked from commit 52bbcb5)
(cherry picked from commit 44e8c5d)
feat(access): Forfeited and Revoked statuses (backport #3913)
(cherry picked from commit 4cb66df)
(cherry picked from commit 665af18)
(cherry picked from commit 352cb57)
(cherry picked from commit f87124b)
(cherry picked from commit d18f848)
fix(build): Remove stale lock files when installing custom packages (backport #3904)
fix(prm): Add Granular permissions (backport #3912)
(cherry picked from commit ae7e43a)
refactor(auto-scale): Secondary server options (backport #4060)
- List valid teams in alphabetical order - Add a search field for listed teams (cherry picked from commit d9bab7e)
- Display search field in switch team dialogue only when more than 5 teams are listed (cherry picked from commit cc242ed)
fix(ui): Update switch team dialog (backport #4019)
Wazuh is an open source security monitoring and safeguarding system. This commit includes playbooks to install and uninstall Wazuh agents in a linux system. - https://wazuh.com/ - https://documentation.wazuh.com/current/installation-guide/wazuh-agent/ (cherry picked from commit 67851c6)
(cherry picked from commit 6c0f3ba)
(cherry picked from commit dd4df50)
(cherry picked from commit 95ad48f)
(cherry picked from commit 004d817)
feat(security): Wazuh (backport #4064)
fix: Dont track changes for (some) log doctypes (backport #3989)
(cherry picked from commit 216a231)
…for scheduled auto scales (cherry picked from commit dc0adf0)
(cherry picked from commit 2c2aea2)
(cherry picked from commit e07e6cf)
…s are running (cherry picked from commit d3d3091)
(cherry picked from commit 3d718eb)
… exists (cherry picked from commit 95a68f0)
refactor(auto-scale): Upstream refactor & scheduled auto scales (backport #4067)
Co-authored-by: Tanmoy Sarkar <[email protected]>
(cherry picked from commit ac06af5)
(cherry picked from commit cb95c12) # Conflicts: # press/fixtures/agent_job_type.json
…ry switch (cherry picked from commit ce53667)
fix(prm): Fix partner discount (backport #4071)
feat(auto-scale): Add agent jobs for multiple upstream additions (backport #4070)
…led servers (cherry picked from commit 4424e75)
feat(auto-scale): Allow loopback requests for redis ports (backport #4075)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
No description provided.