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
fix(dependency): Fix component data binding (backport #4589)
(cherry picked from commit 8196509)
chore(feedback): Rotate feedback categories (backport #4592)
(cherry picked from commit e57fcbf)
fix(site): Only check for trial plans and without payment mode set (backport #4591)
(cherry picked from commit 7404259)
fix(billing): Show correct payment provider (backport #4595)
(cherry picked from commit e0170ef)
fix(permissions): Give press member permissions to scale (backport #4599)
(cherry picked from commit 50d373a)
fix(permissions): Give press member permissions to trigger (backport #4602)
(cherry picked from commit 244df08)
fix(permissions): Give press member permissions to nfs attach and detach (backport #4604)
(cherry picked from commit 924d933)
(cherry picked from commit a840abb)
feat(auto-scale): Add dedicated workers for autoscale related tasks (backport #4609)
fix(prm): Transfer discounts (backport #4606)
…laps Part of frappe-ui upgrade.
fix(dependency): Rearrange component stacking context to prevent over…
This is part of frappe-ui upgrade
fix(dependency): Resolve z-index overlap for Header
(cherry picked from commit f2eba6c)
fix(erpnext-signup): Add share details consent checkbox (backport #4611)
(cherry picked from commit 7dcca8b)
(cherry picked from commit f7f322d)
(cherry picked from commit 5c44580)
fix(code): Mixed tabs and spaces in comments (backport #4726)
(cherry picked from commit 2017b0a)
fix(github): Replace `bench` arg with `name` to pass protected wrapper (backport #4728)
…r (vue) (cherry picked from commit 4dcbf45)
fix(github): Vue: replace `bench` with `name` to pass protected wrapper (backport #4730)
(cherry picked from commit 5cbe36b)
fix(firewall): Use `conntrack` match (backport #4732)
(cherry picked from commit f734da3)
fix(roles): Press member permissions (backport #4735)
(cherry picked from commit 324e82d) # Conflicts: # dashboard/src/components/site/SiteAnalytics.vue
feat(site-analytics): Add datazoom to chart (backport #4103)
…-4103 Revert "feat(site-analytics): Add datazoom to chart (backport #4103)"
(cherry picked from commit bcf5d7b) # Conflicts: # dashboard/src/components/site/SiteAnalytics.vue
feat(site-analytics): Add datazoom to chart (backport #4741)
(cherry picked from commit 2e87f57)
fix(site-analytics): Convert timestamp to ms before serialising (backport #4743)
(cherry picked from commit cbe41b4)
fix(site-analytics): Fix call syntax to get_usage (backport #4745)
(cherry picked from commit 62804db)
fix(firewall): Use conntrack source and destination (backport #4747)
(cherry picked from commit 6c9c53f)
fix(site-analytics): Fix call syntax to get_nginx_request_by_ (backport #4749)
(cherry picked from commit 8dbf448)
fix(analytics): Fix call syntax to get_additional_duration_reports (backport #4751)
(cherry picked from commit cdd54fb)
fix: Dont override version when site app list changes (backport #4755)
(cherry picked from commit a4b12a8)
fix: Bug in setting bench for site (backport #4757)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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.