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 |
|
Shariq Ansari
|
59999599a3
|
fix: use crmUsers in all link field
(cherry picked from commit e9573278773f77b9b179c0e088a73011f3f5f9ff)
|
2025-06-23 07:54:32 +00:00 |
|
Shariq Ansari
|
b83b4847e7
|
fix: loading state in Users page
(cherry picked from commit 2fdea90ad4176b40ac6a8a8d2d75cd6fcf64ce8b)
|
2025-06-23 07:54:31 +00:00 |
|
Shariq Ansari
|
df605f1a9a
|
fix: add user is actually add role
(cherry picked from commit ad1aee9c9e03f37e1deabc5b3941032e165f60a8)
|
2025-06-23 07:54:31 +00:00 |
|
Shariq Ansari
|
bae37529e5
|
fix: if role is set to sales user then remove modules and set FCRM
(cherry picked from commit bd7451e86f1b41483ffc92c51ab51457c4d31490)
|
2025-06-23 07:54:31 +00:00 |
|
Shariq Ansari
|
aa60a03484
|
fix: use text-ink-gray-8 instead of 9
(cherry picked from commit 0230360145edf92bf8f9a3d8a5ab593f93ec71a3)
|
2025-06-23 07:54:30 +00:00 |
|
Shariq Ansari
|
5aaacde6e6
|
fix: dark mode fixes for email account setting
(cherry picked from commit eee1190f10623b6daa374ed59676f639152ceae7)
# Conflicts:
# frontend/src/components/Settings/ProfileImageEditor.vue
|
2025-06-23 07:54:30 +00:00 |
|
Shariq Ansari
|
7f18b78be8
|
chore: fixed warning
(cherry picked from commit 96c8aae01ef0b2977b8ef71dc0097e29f9b4201d)
|
2025-06-23 07:54:30 +00:00 |
|
Shariq Ansari
|
e267445a80
|
fix: layout change
(cherry picked from commit 0ad65be961ff70f069be78979004820d827a96d0)
|
2025-06-23 07:54:30 +00:00 |
|
Shariq Ansari
|
c8d165593a
|
fix: existingEmail is a list
(cherry picked from commit 0f8d484e282a2773c23ca927d3e39d7d9d87707b)
|
2025-06-23 07:54:29 +00:00 |
|
Shariq Ansari
|
1b30b3ebec
|
fix: updated users page to update user directly and removed unnecessary code
(cherry picked from commit 364c369199c4204962a55c58bc0980d3942e3e8b)
|
2025-06-23 07:54:29 +00:00 |
|
Shariq Ansari
|
e3cd126304
|
fix: removed CRM User doctype and moved api's to user.py
(cherry picked from commit 901bcb84602eb2a0a1ac7bcdf1743107cbeb301f)
|
2025-06-23 07:54:29 +00:00 |
|
Shariq Ansari
|
ffd24933cd
|
fix: use multi select user input and show already exist error if user with email exist or invited
(cherry picked from commit d06ac91052021be38952d9956e418ff868c11af5)
|
2025-06-23 07:54:29 +00:00 |
|
Shariq Ansari
|
1810b31647
|
fix: created multi select user input
(cherry picked from commit f818a4c1d6ee4defeacacfbc39c4ef40309d01b1)
|
2025-06-23 07:54:28 +00:00 |
|
Shariq Ansari
|
7fbda3ec9c
|
fix: use crmUsers in comment box
(cherry picked from commit 85191e10c881490ae420156798a320935a9c6fa2)
|
2025-06-23 07:54:28 +00:00 |
|
Shariq Ansari
|
c3a89c564b
|
fix: get users and crm users
(cherry picked from commit 001a3231e1342dabf9a611ecc2e79e4a25182943)
|
2025-06-23 07:54:28 +00:00 |
|
Shariq Ansari
|
6abc772281
|
fix: added tooltip with shortcut
(cherry picked from commit d951dff5a90d1aa4df28068e93a2407c04dff9b6)
|
2025-06-23 07:54:28 +00:00 |
|
Shariq Ansari
|
d98899d954
|
fix: moved change password modal in global modals
(cherry picked from commit dc82f837aa95a4d1dd54e9a42ebfe270bf2260b1)
|
2025-06-23 07:54:27 +00:00 |
|
Shariq Ansari
|
7a9172d94b
|
fix: change password validation messsage
(cherry picked from commit 7f1db0b44402a31c1e4b35f76dce34fca6a365cc)
|
2025-06-23 07:54:27 +00:00 |
|
Shariq Ansari
|
f48b664679
|
fix: updated components.d.ts
(cherry picked from commit 4c7269e357cc44a7a4f7b15d698bc876c60acef4)
# Conflicts:
# frontend/components.d.ts
|
2025-06-23 07:54:27 +00:00 |
|
Shariq Ansari
|
a6e8e64d49
|
fix: use validateIsImageFile from utils
(cherry picked from commit 15fd763de8cb4cb9045a4e68f0647b6dc21f32cc)
|
2025-06-23 07:54:26 +00:00 |
|
Shariq Ansari
|
cc8868d892
|
chore: resolved conflict
(cherry picked from commit efd03141f0121eed09958741d95d5b457010e03f)
# Conflicts:
# frontend/components.d.ts
|
2025-06-23 07:54:26 +00:00 |
|
Shariq Ansari
|
1f1ee74b74
|
Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue
(cherry picked from commit 675bcb549d5b60bc904c2d2d9f9098bf9b74cd66)
# Conflicts:
# frontend/src/components/Settings/ProfileImageEditor.vue
|
2025-06-23 07:54:26 +00:00 |
|
Shariq Ansari
|
f3b8d87204
|
fix: updated components.d.ts
(cherry picked from commit 56425254a9139f3c582dcb90c4fa72ad922da3b8)
# Conflicts:
# frontend/components.d.ts
|
2025-06-23 07:54:25 +00:00 |
|
Shariq Ansari
|
de7cf372e7
|
fix: only show users to manager
(cherry picked from commit 22856351fd9613f654df319f1714aafc5c4f626f)
|
2025-06-23 07:54:25 +00:00 |
|