Shariq Ansari
|
f6af8d562e
|
fix: added on before create hook in all modals
(cherry picked from commit 2e5c1bc3b564a9c7e1dd49f521cd4ec36b202102)
|
2025-06-30 14:12:26 +00:00 |
|
Shariq Ansari
|
d8f990ac8e
|
fix: added on before create hook in call log modal
(cherry picked from commit ac13b7a3bd58021a91793817f07b4703bd8f42b4)
|
2025-06-30 14:12:26 +00:00 |
|
Shariq Ansari
|
bca6ef575a
|
feat: added on before create hook in document.js
(cherry picked from commit 6b7bdf5afbbd40e6799abdf5de7fc3aa2301abb7)
|
2025-06-30 14:12:26 +00:00 |
|
Shariq Ansari
|
093994353d
|
Merge pull request #983 from frappe/mergify/bp/main-hotfix/pr-980
|
2025-06-30 12:55:11 +05:30 |
|
Shariq Ansari
|
0e87e33ab2
|
chore: resolved conflict
|
2025-06-30 12:53:15 +05:30 |
|
frappe-pr-bot
|
11bc742f74
|
chore: update POT file
(cherry picked from commit cc411f036d7321cc436d7e70f6c7e84ffabae209)
# Conflicts:
# crm/locale/main.pot
|
2025-06-30 07:13:55 +00:00 |
|
Shariq Ansari
|
6cbfaf56a3
|
Merge pull request #976 from frappe/mergify/bp/main-hotfix/pr-971
|
2025-06-30 12:41:51 +05:30 |
|
Shariq Ansari
|
aff26a5ea2
|
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-971
|
2025-06-30 12:36:10 +05:30 |
|
Pratik
|
5c41df0ad6
|
Merge branch 'main-hotfix' of https://github.com/frappe/crm into main-hotfix
|
2025-06-30 06:58:27 +00:00 |
|
Shariq Ansari
|
743e0ad522
|
Merge pull request #982 from frappe/mergify/bp/main-hotfix/pr-978
|
2025-06-30 12:01:40 +05:30 |
|
Shariq Ansari
|
c1b3a201a2
|
feat: create dynamic alias to use components from frontend vue apps
(cherry picked from commit f4f799f636410ac535ba119449b8bfbb81ffc562)
|
2025-06-30 06:30:34 +00:00 |
|
Pratik
|
1aaafc41d2
|
style: switch button position
|
2025-06-29 12:37:00 +00:00 |
|
Pratik
|
6292824f41
|
refactor: remove unnecessary functions & components
|
2025-06-29 12:36:50 +00:00 |
|
Pratik
|
2ef3ccafc7
|
refactor: change labels & function names
|
2025-06-29 12:36:40 +00:00 |
|
Pratik
|
369292f523
|
refactor: internationalization & code clean up
|
2025-06-29 12:36:33 +00:00 |
|
Pratik
|
acc746bd15
|
refactor: move delete button
|
2025-06-29 12:36:27 +00:00 |
|
Pratik
|
71f9b8e79f
|
style: fix dark mode styles
|
2025-06-29 12:36:21 +00:00 |
|
Pratik
|
0bc1ee4c4e
|
feat: add list view & handle bulk delete, unlink - cherry-picked
|
2025-06-29 12:36:11 +00:00 |
|
Pratik
|
f66de4cc72
|
feat: handle bulk delete
|
2025-06-29 12:35:36 +00:00 |
|
Pratik
|
2b27a21316
|
feat: handle linked docs while deleting - cherry-picked
|
2025-06-29 12:35:25 +00:00 |
|
Shariq Ansari
|
547ffc5f65
|
fix: delete icon issue & more cleanup
(cherry picked from commit 65435cf2b52157d15a00371c75d431d352cf6443)
# Conflicts:
# frontend/src/components/BulkDeleteLinkedDocModal.vue
# frontend/src/components/DeleteLinkedDocModal.vue
# frontend/src/components/ListViews/LinkedDocsListView.vue
# frontend/src/pages/Deal.vue
# frontend/src/pages/Lead.vue
|
2025-06-26 12:24:37 +00:00 |
|
Shariq Ansari
|
516b8e09a1
|
build(deps): bump frappeui to 0.1.162
(cherry picked from commit af4c64e63345498bd8ba9a351e05b65dca464c08)
|
2025-06-26 12:24:36 +00:00 |
|
Shariq Ansari
|
1a036a8b1c
|
fix: cannot change role of user with Admin access
(cherry picked from commit 41b913debe153798def9d355e81a6a3e3fddf7fd)
|
2025-06-26 12:24:36 +00:00 |
|
Shariq Ansari
|
275e887dc2
|
fix: give Sales Manager & Sales User role if System Manager access is given
(cherry picked from commit a3b9368953eefce422f9ee563328422d23b76085)
|
2025-06-26 12:24:36 +00:00 |
|
Shariq Ansari
|
4f1348b08c
|
style: better spacing
(cherry picked from commit 28ece820ed38dde603102ee5efe711bbc3fc058b)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
65b635eeb3
|
style: minor changes
(cherry picked from commit cca420b1a06c78b9623259ed7897720a06d5aaaa)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
d184068760
|
fix: make email template row clickable
(cherry picked from commit 05803c79b4e30de9d3d0b9b5f5c2a875d02cc719)
|
2025-06-26 12:24:35 +00:00 |
|
Shariq Ansari
|
35533a8296
|
fix: add new email template from email selector modal
(cherry picked from commit 5932ccafec0d5e346f5e5a47962dd90cdc84391c)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
18e9d1e3fc
|
fix: removed email template page and related components
(cherry picked from commit 7cee017e20709b4d101d62e7d08787636d10659a)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
61625f2938
|
fix: added email template icon
(cherry picked from commit b15a8d9c8ae058a3052f3e58805ca9ac37be6fed)
|
2025-06-26 12:24:34 +00:00 |
|
Shariq Ansari
|
3f51da59ad
|
fix: Duplicate email template
(cherry picked from commit 7e6d5c3e544b784b07ae0975b4ae784fb9f9ee46)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
ab6ea90c66
|
fix: Edit email template
(cherry picked from commit dd3d297dab4fb2380889b4cec39aeba53f102896)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
d2527da5a4
|
fix: Create email template
(cherry picked from commit e4f728d809b20e54d4057cbb9e699bfe1c2bc06f)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
b799e8dbb4
|
feat: Create/Edit & List page for email template & implemented delete from list
(cherry picked from commit cd7bab918448e914516b43536d346068bbdfe659)
|
2025-06-26 12:24:33 +00:00 |
|
Shariq Ansari
|
b932130bb2
|
fix: only show search if users are more than 10
(cherry picked from commit ec6b1558b15432490ba3e1933c2448b2d32c5a4b)
|
2025-06-26 12:24:32 +00:00 |
|
Shariq Ansari
|
14ac102d6d
|
refactor: added email templates in settings modal
(cherry picked from commit 1c3ee8b557bf9371aad2d6803876095a1c0a8026)
|
2025-06-26 12:24:32 +00:00 |
|
Shariq Ansari
|
aa59703709
|
Merge pull request #961 from frappe/mergify/bp/main-hotfix/pr-960
fix: Make User page header sticky (backport #960)
|
2025-06-24 12:13:02 +05:30 |
|
Shariq Ansari
|
af6994f8fc
|
fix: make header sticky
(cherry picked from commit 3c1ce1fe2741a5d2f4faa4a0a5be71f188439f07)
|
2025-06-24 06:42:49 +00:00 |
|
Shariq Ansari
|
ee6c16c78d
|
Merge pull request #958 from frappe/mergify/bp/main-hotfix/pr-957
fix: user with System Manager role is admin (backport #957)
|
2025-06-24 11:57:46 +05:30 |
|
Shariq Ansari
|
b843b93454
|
fix: user with System Manager role is admin
(cherry picked from commit b5ed9692dff4997335ae389ac4f836bedc3e7898)
|
2025-06-24 06:16:38 +00:00 |
|
Shariq Ansari
|
ce60dddbc9
|
Merge pull request #954 from frappe/mergify/bp/main-hotfix/pr-953
fix: Added search & role filter in users page (backport #953)
|
2025-06-23 21:06:56 +05:30 |
|
Shariq Ansari
|
ee0114aa35
|
fix: added search in users page
(cherry picked from commit 7fbd240d977c7776ecd221db1248f07071118698)
|
2025-06-23 15:30:55 +00:00 |
|
Shariq Ansari
|
9639c21ff2
|
Merge pull request #951 from frappe/mergify/bp/main-hotfix/pr-845
|
2025-06-23 13:41:41 +05:30 |
|
Shariq Ansari
|
236a5026e3
|
chore: resolved conflict
|
2025-06-23 13:36:50 +05:30 |
|
Shariq Ansari
|
fbbcae7049
|
chore: resolved conflict
|
2025-06-23 13:30:44 +05:30 |
|
Shariq Ansari
|
d9555f62f8
|
chore: resolved conflict
|
2025-06-23 13:27:15 +05:30 |
|
Shariq Ansari
|
6d114f7cb6
|
Merge pull request #950 from frappe/mergify/bp/main-hotfix/pr-946
fix(WhatsApp): prevent TypeError when concatenating first and last name (backport #946)
|
2025-06-23 13:26:04 +05:30 |
|
Shariq Ansari
|
e37b3c6c89
|
Merge pull request #949 from frappe/mergify/bp/main-hotfix/pr-948
|
2025-06-23 13:24:55 +05:30 |
|
Shariq Ansari
|
f0b295a907
|
fix: renaming fix and removed CRM User code
(cherry picked from commit cf1fce3dc0334ec728798f47cc2537726f4dc6ea)
|
2025-06-23 07:54:32 +00:00 |
|
Shariq Ansari
|
a485d8eb6e
|
fix: use change password modal in place
(cherry picked from commit 84d4327e8040a07653cc9bf1cc28639b89f9edbb)
|
2025-06-23 07:54:32 +00:00 |
|