Skip to content
Merged
Show file tree
Hide file tree
Changes from 242 commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
81ec696
refactor(marketplace): Clean up code screening related components
prathameshkurunkar7 Apr 9, 2026
16d1b6c
fix(dashboard): Restrict redirect after login to relative paths
ssiyad Apr 10, 2026
69509fd
refactor(analytics): Add typing to whitelstied functions
tanmoysrt Apr 10, 2026
c8b563b
fix(lint): Ignore sqlparse and elasticsearch_dsl library
tanmoysrt Apr 10, 2026
7945f26
fix(uptime-chart): Update promql query to support empty data points
regdocs Apr 10, 2026
befac96
feat(database): Add MariaDB 11.8 Upgrade Support
tanmoysrt Apr 10, 2026
1f3d469
feat(database): Add play for MariaDB downgrade support
tanmoysrt Apr 10, 2026
0a09e76
feat(database): Method to fetch db version over SSH
tanmoysrt Apr 10, 2026
0627710
feat(database): MariaDB Upgrade Tool [in progress]
tanmoysrt Apr 10, 2026
39fd2dd
fix(permission): Replace has_permission with check_permission in webh…
barredterra Apr 11, 2026
3f2c2d3
feat(analytics): Add protection to advanced analytics and slow logs e…
barredterra Apr 11, 2026
ac92b2e
fix: harden GitHub OAuth callback and redact sensitive logging
barredterra Apr 11, 2026
56f3535
fix(api): tighten site backup link validation
barredterra Apr 11, 2026
4971ef9
test: change user context to "Administrator" for creating test sites
barredterra Apr 11, 2026
c6feec0
style: run pre-commit
barredterra Apr 11, 2026
8a2b866
feat(bench): Add protection to candidate function
barredterra Apr 11, 2026
556de1c
Merge branch 'develop' into mariadb_upgrade
tanmoysrt Apr 13, 2026
b08c6be
fix(uptime-chart): Gray out aggregate bars before creation date
regdocs Apr 13, 2026
7cc7859
feat(uptime-chart): Add datazoom
regdocs Apr 13, 2026
9045b46
fix(uptime-chart): Remove placeholder timegrain
regdocs Apr 13, 2026
75f1262
Merge pull request #6076 from frappe/site-uptime-chart
regdocs Apr 13, 2026
5f90f71
chore(prm): Show only related NC
shadrak98 Apr 13, 2026
c2553db
Merge pull request #6093 from shadrak98/partner-nc-fix
shadrak98 Apr 13, 2026
512b1dd
fix(site-restore): Suggest CLI tool rather than migrate script
balamurali27 Apr 13, 2026
819ded2
feat(dependencies): Automatically add implicit app dependencies
Aradhya-Tripathi Apr 13, 2026
d3cfdcc
Merge branch 'develop' into auto-update-bench-versions
Aradhya-Tripathi Apr 13, 2026
97e1877
fix(dependencies): Get deploy candidate doc
Aradhya-Tripathi Apr 13, 2026
1a0bc31
chore(deploy): Move new flow behind a feature flag
Aradhya-Tripathi Apr 13, 2026
5071f50
chore(deploy): Move to redirection
Aradhya-Tripathi Apr 13, 2026
3ef0f05
chore(dependency): In case we don't find a app source or app give up
Aradhya-Tripathi Apr 13, 2026
3fe23bb
fix(test): Respect deploy flow flag
Aradhya-Tripathi Apr 13, 2026
a6a2bfd
feat(dependencies): Add test for implicit dependency addition
Aradhya-Tripathi Apr 13, 2026
6e416a3
Merge pull request #6098 from frappe/feature-flag
Aradhya-Tripathi Apr 13, 2026
59c59dd
chore(test): Slight change in app check
Aradhya-Tripathi Apr 13, 2026
d837184
Merge branch 'develop' into auto-update-bench-versions
Aradhya-Tripathi Apr 13, 2026
022acde
refactor(dependencies): Update error message with action call
Aradhya-Tripathi Apr 14, 2026
bb06e1b
refactor(dependencies): Avoid get_doc when not required
Aradhya-Tripathi Apr 14, 2026
968aed8
Merge pull request #6097 from frappe/auto-update-bench-versions
Aradhya-Tripathi Apr 14, 2026
53282ec
fix(dependencies): Add dependencies only onces
Aradhya-Tripathi Apr 14, 2026
39097e6
fix(dependencies): In case one app is added just continue
Aradhya-Tripathi Apr 14, 2026
364dbf4
fix(dependencies): Remove extra commit
Aradhya-Tripathi Apr 14, 2026
191b084
Merge pull request #6101 from frappe/dependency-addition-fix
Aradhya-Tripathi Apr 14, 2026
9bdd0f3
Merge branch 'develop' into migrate-script-sugg
balamurali27 Apr 14, 2026
8bdd469
fix(site): Prevent dropping if migration or update pending
balamurali27 Apr 14, 2026
9fbe169
Merge pull request #6094 from frappe/migrate-script-sugg
balamurali27 Apr 14, 2026
46b0d11
feat(compute): Increase disk size
the-bokya Apr 13, 2026
713892f
feat(compute): Add Frappe Compute to disk size increase exception
the-bokya Apr 13, 2026
fb9c61e
feat(compute): Frappe Compute extend volume playbook
the-bokya Apr 14, 2026
6623eca
feat(compute): Disk resize
the-bokya Apr 14, 2026
f81c7a8
fix(deploy): On success pass correct candidate for rediction
Aradhya-Tripathi Apr 14, 2026
7df8410
Merge branch 'develop' into fix-on-success
Aradhya-Tripathi Apr 14, 2026
9687d41
Merge pull request #6105 from frappe/fix-on-success
Aradhya-Tripathi Apr 14, 2026
2d14ae9
refactor(deploy): Auto set dependency versions
Aradhya-Tripathi Apr 14, 2026
02f81a4
Merge branch 'develop' into smarter-node-version-fix
Aradhya-Tripathi Apr 14, 2026
de1624d
Merge branch 'develop' into mariadb_upgrade
tanmoysrt Apr 14, 2026
8cc0907
chore(deploy): Stop forcing people to read help
Aradhya-Tripathi Apr 14, 2026
5a8d38d
chore(deploy): Retrospective fix for new deploy flow
Aradhya-Tripathi Apr 14, 2026
eebca1b
feat(deploy): Auto update python dependency to latest
Aradhya-Tripathi Apr 14, 2026
8444ec7
fix(dependencies): Ensure correct typing
Aradhya-Tripathi Apr 14, 2026
43c308e
fix(team): Give both basic roles to all users
ssiyad Apr 14, 2026
4574f38
Merge branch 'develop' into fix/ux/set_basic_roles
ssiyad Apr 14, 2026
36481cc
Merge pull request #6109 from frappe/fix/ux/set_basic_roles
ssiyad Apr 14, 2026
df076bc
feat(test): Add test for dep upgrade and app addition
Aradhya-Tripathi Apr 14, 2026
5a8aecc
fix(dependencies): Ensure conflicting versions raises
Aradhya-Tripathi Apr 14, 2026
b658f80
Merge branch 'develop' into smarter-node-version-fix
Aradhya-Tripathi Apr 14, 2026
a799df5
feat: Add queue and timeout support in task decorator
tanmoysrt Apr 14, 2026
73987a8
feat(database): Add mariadb upgrade utility
tanmoysrt Apr 14, 2026
998b0b8
Merge branch 'master' into develop
saurabh6790 Apr 14, 2026
9587fb0
Merge branch 'develop' into smarter-node-version-fix
Aradhya-Tripathi Apr 14, 2026
a3d3c89
fix(lint): Imports and Returns
Aradhya-Tripathi Apr 15, 2026
1add645
test(depenendencies): Ensure if not python version is supplied things…
Aradhya-Tripathi Apr 15, 2026
dc10d5f
Merge pull request #6106 from frappe/smarter-node-version-fix
Aradhya-Tripathi Apr 15, 2026
dcde665
Merge branch 'develop' into fix/frontend/login_redirect
ssiyad Apr 15, 2026
30efba1
Merge pull request #6068 from frappe/fix/frontend/login_redirect
ssiyad Apr 15, 2026
2078a71
fix(site): Handle variant of lost connection to mysql server error
balamurali27 Apr 15, 2026
23efeb5
Merge branch 'develop' into agent-job-notifs
balamurali27 Apr 15, 2026
4ca9cd4
Merge branch 'develop' into prevent-site-archive-if-mig
balamurali27 Apr 15, 2026
1481970
fix(agent-job-notification): Make suggestion clearer
balamurali27 Apr 15, 2026
935af8c
feat(database): Add option to delete snapshot
tanmoysrt Apr 15, 2026
35f55c3
Merge branch 'develop' into mariadb_upgrade
tanmoysrt Apr 15, 2026
9a6f226
Merge pull request #6078 from tanmoysrt/mariadb_upgrade
tanmoysrt Apr 15, 2026
45e9f19
fix(test): Pass correct filter in dep updates
Aradhya-Tripathi Apr 15, 2026
4930fb7
fix(compute): Make volume finding generic
the-bokya Apr 15, 2026
5cf035a
fix(compute): Keep Add On storage log for later
the-bokya Apr 15, 2026
457c4ec
Merge branch 'develop' into feat-frappe-compute-resize-disk
the-bokya Apr 15, 2026
2a0819d
Merge pull request #6096 from the-bokya/feat-frappe-compute-resize-disk
the-bokya Apr 15, 2026
10bd671
fix(notifications): remove typo in api url & include param for suppor…
siduck Apr 15, 2026
995bb2a
fix(sidebar): spacing between brand logo and navitem
siduck Apr 15, 2026
8e88b34
fix(notifications): open modal for support access type
siduck Apr 15, 2026
f4f7d17
Merge branch 'develop' into fix-test
Aradhya-Tripathi Apr 15, 2026
5650077
feat(sidebar): include unread indicator for notif icon
siduck Apr 15, 2026
d2d6a47
feat(search): access request must open notif panel
siduck Apr 15, 2026
5347567
Merge pull request #6116 from frappe/fix-test
Aradhya-Tripathi Apr 15, 2026
74225ad
Revert "Merge pull request #5678 from frappe/tz-fixes"
balamurali27 Apr 15, 2026
2aa9b65
feat(db-analyzer): Add Lock Timeout Report
tanmoysrt Apr 15, 2026
5baae8b
ci: Add tests-pass required status check job
Copilot Apr 10, 2026
580f92c
Merge branch 'develop' into lock_wait_timeout_report
tanmoysrt Apr 15, 2026
0a536ba
Merge pull request #6123 from tanmoysrt/lock_wait_timeout_report
tanmoysrt Apr 15, 2026
e66da8d
fix(sidebar): add hover bg for few links
siduck Apr 15, 2026
5961a87
fix(sidebar): update support link in help dropdown
siduck Apr 15, 2026
91c3a99
fix(toast): add letter-spacing by prose-sm class
siduck Apr 15, 2026
a436858
fix(sidebar): improve mobile view
siduck Apr 15, 2026
610f31b
Merge branch 'develop' into ci-cache-fix
balamurali27 Apr 15, 2026
7459faf
Merge pull request #6124 from frappe/ci-cache-fix
balamurali27 Apr 15, 2026
5cd383f
fix(notification-panel): improve mobile view
siduck Apr 15, 2026
3d5ed4b
feat(marketplace-api): Add proper validation and perm checks
prathameshkurunkar7 Apr 15, 2026
be66dbb
fix(marketplace-api): Improve image upload error message
prathameshkurunkar7 Apr 15, 2026
1f884f1
feat(app): Auto add & install app based on policies
Aradhya-Tripathi Apr 15, 2026
0134304
Merge branch 'develop' into check-perm
ssiyad Apr 15, 2026
37b9459
fix(release-pipeline): Ensure correct python version for builds
Aradhya-Tripathi Apr 15, 2026
537a585
Merge branch 'develop' into protect-deploy-candidate
ssiyad Apr 15, 2026
153bfe2
chore(mypy): Add missing imports configuration for pillow
prathameshkurunkar7 Apr 15, 2026
7f7081d
Merge branch 'develop' into protect-analytics
ssiyad Apr 15, 2026
ad7a40d
Merge branch 'develop' into s3-backup-url
ssiyad Apr 15, 2026
d32c341
Merge branch 'develop' into authorize-github
barredterra Apr 15, 2026
2e6ddb2
Merge pull request #6128 from frappe/python-version-fix
Aradhya-Tripathi Apr 15, 2026
d22e5be
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 15, 2026
61f8adb
chore(app): Remove debug prints
Aradhya-Tripathi Apr 15, 2026
c0e6158
Merge branch 'develop' into protect-deploy-candidate
ssiyad Apr 15, 2026
2ef9d09
fix(prm): Add certification in renewal criteria
shadrak98 Apr 15, 2026
ef54540
Merge pull request #6086 from barredterra/protect-deploy-candidate
ssiyad Apr 15, 2026
10deb9f
Merge branch 'develop' into s3-backup-url
ssiyad Apr 15, 2026
80f77a1
fix(prm): Add icon
shadrak98 Apr 15, 2026
2d7afd3
Merge branch 'develop' into cert-renewal
shadrak98 Apr 15, 2026
2cfbd25
Merge branch 'develop' into protect-analytics
ssiyad Apr 15, 2026
7d38d90
Merge pull request #6083 from barredterra/protect-analytics
ssiyad Apr 15, 2026
63f92d9
Merge branch 'develop' into check-perm
ssiyad Apr 15, 2026
6bcfb31
Merge pull request #6082 from barredterra/check-perm
ssiyad Apr 15, 2026
4d951a0
Merge branch 'develop' into authorize-github
ssiyad Apr 15, 2026
cb3d8e7
Merge pull request #6130 from shadrak98/cert-renewal
shadrak98 Apr 15, 2026
448c638
Merge branch 'develop' into type_checking_analytics
tanmoysrt Apr 15, 2026
6ef4236
Merge pull request #6121 from frappe/fix-notifications
siduck Apr 16, 2026
a6659d7
Merge branch 'develop' into fix-marketplace-api-endpoints-and-tests
ssiyad Apr 16, 2026
8ae8bf7
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 16, 2026
8e5cc16
Merge pull request #6127 from prathameshkurunkar7/fix-marketplace-api…
prathameshkurunkar7 Apr 16, 2026
9fa48ae
Merge branch 'develop' into authorize-github
ssiyad Apr 16, 2026
62567fa
Merge branch 'develop' into type_checking_analytics
tanmoysrt Apr 16, 2026
7edd915
Merge pull request #6073 from tanmoysrt/type_checking_analytics
tanmoysrt Apr 16, 2026
d9b6fd3
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 16, 2026
78e1500
Merge branch 'develop' into authorize-github
ssiyad Apr 16, 2026
a55579d
Merge pull request #6084 from barredterra/authorize-github
ssiyad Apr 16, 2026
a985f0e
fix(marketplace): Add type hints to whitelisted endpoints
prathameshkurunkar7 Apr 16, 2026
03b455f
Merge branch 'develop' into add-type-hints-to-marketplace-whitelisted…
prathameshkurunkar7 Apr 16, 2026
b804af4
Merge pull request #6136 from prathameshkurunkar7/add-type-hints-to-m…
prathameshkurunkar7 Apr 16, 2026
1316931
Merge branch 'develop' into refactor-app-approval-request-flow-and-wi…
prathameshkurunkar7 Apr 16, 2026
fc33974
refactor(marketplace): Update review status and remove deprecated fields
prathameshkurunkar7 Apr 16, 2026
36a5d70
feat(marketplace-settings): Add enable audit actions flag
prathameshkurunkar7 Apr 16, 2026
63786c2
feat: Allow domain management from site
surajshetty3416 Apr 16, 2026
e8acfa3
Merge branch 'develop' into agent-job-notifs
balamurali27 Apr 16, 2026
d388e57
Merge branch 'develop' into prevent-site-archive-if-mig
balamurali27 Apr 16, 2026
9d11f34
Merge pull request #6115 from frappe/agent-job-notifs
balamurali27 Apr 16, 2026
1e89337
fix(notifications): decrement unreadcount only if unread rows are cli…
siduck Apr 16, 2026
f4ecd95
refactor(app): Better bench app management utility
Aradhya-Tripathi Apr 16, 2026
7302a42
Merge pull request #6143 from frappe/fix-notifications
siduck Apr 16, 2026
b9aab3f
fix(billing): Don't update invoice if already void
shadrak98 Apr 16, 2026
6565f7d
Merge branch 'develop' into fix-billing-issue
shadrak98 Apr 16, 2026
33ded8a
Merge pull request #6146 from shadrak98/fix-billing-issue
shadrak98 Apr 16, 2026
66134c6
feat: Add endpoint to get outbound IP of a site
surajshetty3416 Apr 16, 2026
5a6332b
Merge branch 'develop' into endpoints-to-manage-domain
surajshetty3416 Apr 16, 2026
05aab88
refactor(app): Scoped policies
Aradhya-Tripathi Apr 16, 2026
cebcac3
fix(ui): Just remove the banners
Aradhya-Tripathi Apr 16, 2026
0be4e4d
Merge branch 'develop' into s3-backup-url
barredterra Apr 16, 2026
b39ea7f
Merge pull request #6148 from frappe/remove-warnings
Aradhya-Tripathi Apr 16, 2026
37e9ea2
fix(sidebar): padding and hover bg colors
siduck Apr 16, 2026
baee479
fix(notification): Provide route for notifications
Aradhya-Tripathi Apr 16, 2026
5cc8418
Merge branch 'develop' into endpoints-to-manage-domain
balamurali27 Apr 16, 2026
6e9750a
Merge pull request #6151 from frappe/build-notification-fix
Aradhya-Tripathi Apr 16, 2026
8b1fc52
Merge branch 'develop' into endpoints-to-manage-domain
surajshetty3416 Apr 16, 2026
bd208e4
fix: Add `suspended_at` field to Site doctype
AyshaHakeem Apr 12, 2026
f434146
fix: Add set_suspended_at_for_suspended_sites patch
AyshaHakeem Apr 12, 2026
fe0e73d
fix: Set and unset `suspended_at` field on site suspension and activa…
AyshaHakeem Apr 12, 2026
c8ef82f
fix: Update archive_suspended_sites job
AyshaHakeem Apr 16, 2026
0d351d7
fix: Update notify_sites_before_archival method
AyshaHakeem Apr 16, 2026
9be84a4
test: Add tests for notifying user and archival of suspended sites
AyshaHakeem Apr 16, 2026
9de3027
fix: Handle archival of all suspended sites in one job
AyshaHakeem Apr 16, 2026
ba809cc
Merge pull request #6139 from AyshaHakeem/fix-suspended-sites-archival
AyshaHakeem Apr 16, 2026
cf9bd67
Merge branch 'develop' into endpoints-to-manage-domain
surajshetty3416 Apr 16, 2026
1a8a977
Merge pull request #6141 from surajshetty3416/endpoints-to-manage-domain
balamurali27 Apr 16, 2026
0fb19ef
fix(test): clear stale site cache before insert in test helper
barredterra Apr 16, 2026
72f6508
Merge branch 'develop' into s3-backup-url
ssiyad Apr 16, 2026
1251bce
Merge pull request #6150 from frappe/fix-notifications
siduck Apr 16, 2026
3fa3de7
fix(type): Apply types to partner endpoints
shadrak98 Apr 16, 2026
a14325f
Merge branch 'develop' into type-prm
shadrak98 Apr 16, 2026
b46f37c
Merge branch 'develop' into s3-backup-url
ssiyad Apr 16, 2026
cf6a8dc
Merge pull request #6085 from barredterra/s3-backup-url
ssiyad Apr 16, 2026
d6c4394
feat: Prevent approval requests for yanked releases
prathameshkurunkar7 Apr 16, 2026
3389c74
feat(auditor): Add actions based on audit outcomes
prathameshkurunkar7 Apr 16, 2026
01d380a
feat: Add option to CC reviewer on audit report emails
prathameshkurunkar7 Apr 17, 2026
f34b440
Merge branch 'develop' into refactor-app-approval-request-flow-and-wi…
prathameshkurunkar7 Apr 17, 2026
c181168
chore(dependencies): Add semgrep version 1.159.0 to project dependencies
prathameshkurunkar7 Apr 17, 2026
5ccdc67
Merge pull request #6162 from prathameshkurunkar7/add-semgrep-to-depe…
prathameshkurunkar7 Apr 17, 2026
6a22603
Merge pull request #6158 from shadrak98/type-prm
shadrak98 Apr 17, 2026
bfc9184
feat: Upgrade frappe UI and vite to latest version
siduck Apr 17, 2026
95f1e20
Merge branch 'develop' into refactor-app-approval-request-flow-and-wi…
prathameshkurunkar7 Apr 17, 2026
8d63ab8
feat(app): Allow option for mandatory upgrades
Aradhya-Tripathi Apr 17, 2026
dff34b2
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 17, 2026
76c037d
refactor(app): Use standard dict notations
Aradhya-Tripathi Apr 17, 2026
13eb331
chore(sidebar): remove useless class
siduck Apr 17, 2026
7fb093f
chore(test): Better test naming
Aradhya-Tripathi Apr 17, 2026
781c8c8
fix(search): Layout and platform specific shortcut issue
prathameshkurunkar7 Apr 17, 2026
ba60d40
Merge pull request #6167 from prathameshkurunkar7/fix-search-layout-a…
prathameshkurunkar7 Apr 17, 2026
a46aebf
fix(search): Wire keyboard shortcuts for search modal on windows
prathameshkurunkar7 Apr 17, 2026
7c39d3a
Merge pull request #6168 from prathameshkurunkar7/wire-up-ctrl-k-on-w…
prathameshkurunkar7 Apr 17, 2026
e1f5c03
Merge branch 'develop' into fix-ui
siduck Apr 17, 2026
21efa86
fix(search): Remove + from shortcut
prathameshkurunkar7 Apr 17, 2026
06decc5
feat(auto-add): Tests
Aradhya-Tripathi Apr 17, 2026
0eb776c
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 17, 2026
12b45c9
fix(playwright): dynamically generate src filename instead of hardcod…
siduck Apr 17, 2026
0edab71
Merge pull request #6165 from frappe/fix-ui
regdocs Apr 17, 2026
956261f
Merge branch 'develop' into auto-install-manager
Aradhya-Tripathi Apr 17, 2026
be835a6
Merge pull request #6129 from frappe/auto-install-manager
Aradhya-Tripathi Apr 17, 2026
cf970cd
fix(prm): Support all certification course
shadrak98 Apr 18, 2026
2e9b717
Merge pull request #6172 from shadrak98/fs-cert-type
shadrak98 Apr 18, 2026
bbd39c2
fix(prm): Auto approve link request
shadrak98 Apr 18, 2026
6b23b3a
Merge pull request #6174 from shadrak98/auto-approval
shadrak98 Apr 18, 2026
b94bac5
fix: Update import statement for 'find' utility
surajshetty3416 Apr 18, 2026
549fe24
Merge pull request #6175 from surajshetty3416/fix-bad-import
surajshetty3416 Apr 18, 2026
253c284
refactor: remove decorator to simplify code
surajshetty3416 Apr 18, 2026
b80f5e6
Merge branch 'develop' into fix-bad-import
surajshetty3416 Apr 18, 2026
20bcfdb
Merge pull request #6176 from surajshetty3416/fix-bad-import
surajshetty3416 Apr 18, 2026
f4234a2
fix(user-ssh-certificate): correct principal and command if proxy ser…
phot0n Apr 19, 2026
b886f5a
Merge pull request #6177 from phot0n/usr-ssh-cert-fix
phot0n Apr 19, 2026
5bf0a5c
fix(ui): consistent padding and improve banner
siduck Apr 19, 2026
e697e6a
fix(server): Only update virtual machine name if virtual machine is set
20vikash Apr 19, 2026
95da032
refactor(server): Check the existence of virtual machine field in upd…
20vikash Apr 19, 2026
3780b90
fix(server): Fix linting issues
20vikash Apr 19, 2026
d091484
Merge branch 'develop' into refactor-app-approval-request-flow-and-wi…
prathameshkurunkar7 Apr 20, 2026
499c7c7
feat(audit): Mark "Attention Required" status for failing apps
prathameshkurunkar7 Apr 20, 2026
66a995a
Merge pull request #6180 from 20vikash/server-fix
tanmoysrt Apr 20, 2026
fb43a52
Merge branch 'develop' into refactor-app-approval-request-flow-and-wi…
prathameshkurunkar7 Apr 20, 2026
37bfe04
Merge branch 'develop' into prevent-site-archive-if-mig
balamurali27 Apr 20, 2026
b7ad8b6
fix(biling): Updating payment mode if the invoice is in draft state
Bowrna Apr 20, 2026
bd61e1a
Merge pull request #6104 from frappe/prevent-site-archive-if-mig
balamurali27 Apr 20, 2026
e5c2e4b
Merge branch 'develop' into update_payment_mode_in_invoice
Bowrna Apr 20, 2026
9fc77d5
Merge pull request #6183 from Bowrna/update_payment_mode_in_invoice
Bowrna Apr 20, 2026
8047069
Merge pull request #6161 from prathameshkurunkar7/refactor-app-approv…
prathameshkurunkar7 Apr 20, 2026
efeb696
Merge branch 'master' into release/2026-W17
saurabh6790 Apr 20, 2026
efad29c
refactor: Simplify auth handling using whitelist_saas_api
surajshetty3416 Apr 20, 2026
348bf4d
chore(api): Domain: lint
ssiyad Apr 20, 2026
e406025
Merge pull request #6191 from frappe/mergify/bp/release/2026-W17/pr-6190
surajshetty3416 Apr 20, 2026
ba628f1
Merge branch 'master' into release/2026-W17
Aradhya-Tripathi Apr 21, 2026
71baf5e
Merge pull request #6197 from frappe/new-flow-ui
Aradhya-Tripathi Apr 21, 2026
cc3e665
Merge pull request #6206 from prathameshkurunkar7/fix-code-screening-…
prathameshkurunkar7 Apr 21, 2026
68247d3
refactor(patch): Replace SQL queries with query builder
prathameshkurunkar7 Apr 21, 2026
a3fc58f
fix(patch): Correct SQL update statement formatting
prathameshkurunkar7 Apr 21, 2026
5a951b4
fix(patch): Correct nosemgrep and queries
prathameshkurunkar7 Apr 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -287,14 +287,14 @@
"filename": "press/api/tests/test_marketplace.py",
"hashed_secret": "1e2a4c3be8ec693658961500ff918de4c188b4f1",
"is_verified": false,
"line_number": 63
"line_number": 61
},
{
"type": "Hex High Entropy String",
"filename": "press/api/tests/test_marketplace.py",
"hashed_secret": "a6362a1031d1d2039364ea6b51694151bf388a40",
"is_verified": false,
"line_number": 71
"line_number": 69
}
],
"press/auth.py": [
Expand Down Expand Up @@ -547,5 +547,5 @@
}
]
},
"generated_at": "2026-03-17T02:42:49Z"
"generated_at": "2026-04-15T16:58:31Z"
}
13 changes: 5 additions & 8 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"lint": "eslint src",
"test:e2e": "playwright test",
"test:e2e:headed": "playwright test --headed",
"test:e2e:report": "playwright show-report",
"postinstall": "patch-package"
"test:e2e:report": "playwright show-report"
},
"dependencies": {
"@codemirror/autocomplete": "^6.18.1",
Expand All @@ -32,14 +31,13 @@
"echarts": "^5.4.3",
"feather-icons": "^4.26.0",
"frappe-charts": "2.0.0-rc22",
"frappe-ui": "0.1.238",
"frappe-ui": "0.1.277",
"fuse.js": "6.6.2",
"libarchive.js": "^1.3.0",
"lodash": "^4.17.19",
"luxon": "^1.22.0",
"markdown-it": "^12.3.2",
"papaparse": "^5.4.1",
"patch-package": "^8.0.1",
"qrcode": "^1.5.4",
"register-service-worker": "^1.6.2",
"socket.io-client": "^4.5.1",
Expand All @@ -53,14 +51,13 @@
"vue-sonner": "^1.2.5"
},
"devDependencies": {
"@iconify/json": "^2.2.123",
"@playwright/test": "^1.54.2",
"@tailwindcss/forms": "^0.4.0",
"@tailwindcss/postcss7-compat": "^2.0.2",
"@tailwindcss/typography": "^0.5.1",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^5.0.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"@vue/compiler-sfc": "^3.1.0",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "^2.0.0-rc.19",
Expand All @@ -82,7 +79,7 @@
"tailwindcss": "^3.4",
"typescript": "^5.4.3",
"unplugin-vue-components": "^0.25.2",
"vite": "5.4.20",
"vite": "8.0.1",
"vite-plugin-rewrite-all": "^1.0.1",
"vitest": "^0.9.3",
"vue-tsc": "^2.0.7",
Expand Down
213 changes: 0 additions & 213 deletions dashboard/patches/frappe-ui+0.1.238.patch

This file was deleted.

2 changes: 1 addition & 1 deletion dashboard/src/assets/style.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'frappe-ui/src/style.css';
@import 'frappe-ui/style.css';

@layer components {
/* Works on Firefox */
Expand Down
10 changes: 5 additions & 5 deletions dashboard/src/components/AddressableErrorDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ export default {
setTimeout(() => (this.copied = false), 4000);
},
async done() {
if (this.doc.assistance_url && !this.helpViewed) {
this.error =
'Please follow the steps mentioned in <i>Help</i> before clicking Done';
return;
}
// if (this.doc.assistance_url && !this.helpViewed) {
// this.error =
// 'Please follow the steps mentioned in <i>Help</i> before clicking Done';
// return;
// }

await this.$resources.notification.markAsAddressed.submit();
this.show = false;
Expand Down
14 changes: 5 additions & 9 deletions dashboard/src/components/AlertBanner.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
<template>
<div
:class="`flex items-center justify-between rounded-md border border-${color}-200 bg-${color}-100 px-3.5 py-2.5`"
:class="`flex items-center justify-between rounded-md border border-${color}-300 bg-${color}-100 p-2`"
>
<div class="flex items-center">
<div class="flex items-center gap-2.5">
<lucide-alert-triangle
v-if="showIcon && (type === 'error' || type === 'warning')"
:class="`h-4 w-8 text-${color}-600`"
:class="`ml-1 size-4 text-${color}-600 shrink-0`"
/>
<lucide-info
v-if="showIcon && type === 'info'"
:class="`h-4 w-8 text-${color}-600`"
/>
<div
:class="{ 'ml-3': showIcon }"
class="text-p-base font-medium text-gray-800"
v-html="title"
:class="`ml-1 size-4 text-${color}-600 shrink-0`"
/>
<div class="prose-sm font-medium text-gray-800" v-html="title" />
</div>

<div class="flex items-center">
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/BackupFilesUploader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default {

if (file.size > 5 * 1024 * 1024 * 1024) {
throw new Error(
'File size exceeds the limit of 5 GiB. Please try the <a href="https://docs.frappe.io/cloud/sites/migrate-an-existing-site#migrate-using-python-script" class=underline>migrate</a> script.',
'File size exceeds the limit of 5 GiB. Please try the <a href="https://docs.frappe.io/cloud/sites/migrate-an-existing-site#migrate-using-fc-restore-cli" class=underline>CLI tool</a>.',
);
}

Expand Down
17 changes: 8 additions & 9 deletions dashboard/src/components/ClickToCopyField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<pre
:class="{
'whitespace-pre-wrap': breakLines,
'overflow-x-auto': !breakLines
'overflow-x-auto': !breakLines,
}"
:style="
!breakLines
Expand All @@ -15,8 +15,7 @@
>
</div>
<button
class="absolute right-2 top-2 rounded-sm border border-gray-200 bg-white p-1 text-xs text-gray-600"
variant="outline"
class="absolute right-2 top-2 rounded-sm p-1 text-xs text-gray-600"
@click="copyTextContentToClipboard"
>
{{ copied ? 'copied' : 'copy' }}
Expand All @@ -31,16 +30,16 @@ export default {
props: {
textContent: {
type: String,
required: true
required: true,
},
breakLines: {
type: Boolean,
default: true
}
default: true,
},
},
data() {
return {
copied: false
copied: false,
};
},
methods: {
Expand All @@ -53,7 +52,7 @@ export default {
}, 4000);
toast.success('Copied to clipboard!');
});
}
}
},
},
};
</script>
Loading
Loading