1
0
forked from test/crm

1847 Commits

Author SHA1 Message Date
Shariq Ansari
1519b3539c fix: user with System Manager role is admin
(cherry picked from commit b5ed9692dff4997335ae389ac4f836bedc3e7898)
2025-06-24 06:16:42 +00:00
Shariq Ansari
ee0114aa35 fix: added search in users page
(cherry picked from commit 7fbd240d977c7776ecd221db1248f07071118698)
2025-06-23 15:30:55 +00:00
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
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
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
Shariq Ansari
0520df04d0 fix: updated components.d.ts
(cherry picked from commit dd1229309fb8d035f9c4670cbd61ea2878fc99f8)

# Conflicts:
#	frontend/components.d.ts
2025-06-23 07:54:25 +00:00
Shariq Ansari
bce5eef2c9 refactor: profile page
(cherry picked from commit fad7c5985c05a87386b9d1ea1286398a3ea642e5)

# Conflicts:
#	frontend/components.d.ts
#	frontend/src/components/Settings/ProfileImageEditor.vue
2025-06-23 07:54:25 +00:00
Shariq Ansari
b047dab16d fix: capture onboarding step event of setting up password
(cherry picked from commit 3234102e55356b85aff619557e8f53a614df045b)
2025-06-23 07:54:24 +00:00
Shariq Ansari
54b3802061 feat: update password modal
(cherry picked from commit fb2f105520827e2fb439da230b43ed90892ed329)
2025-06-23 07:54:24 +00:00
Shariq Ansari
f1935156ec feat: add existing users
(cherry picked from commit 6873c6db4e100e7225ebd7c461c31eb9f35356da)
2025-06-23 07:54:22 +00:00
Shariq Ansari
512970cad1 fix: filter out existing emails
(cherry picked from commit 08bab927a2ad5fa06f3d1a000262e11a35f943fd)
2025-06-23 07:54:21 +00:00
Shariq Ansari
f4c033fd52 fix: open invite user page from users add new agent dropdown option
(cherry picked from commit d244567b3067f2281ec7e5e9b95c035cc87ecad9)
2025-06-23 07:54:21 +00:00
Shariq Ansari
aac50e1d10 fix: show role options based on logged in user's role
(cherry picked from commit 2b1b21d2e20435a1306f03322d050b286e77cc65)
2025-06-23 07:54:20 +00:00
Shariq Ansari
142a94e042 fix: show role options based on logged in user's role
(cherry picked from commit 12213de4780926a16ac07a06eb3ce36aa858047d)
2025-06-23 07:54:20 +00:00
Shariq Ansari
d0cbad0ab1 fix: updated roles in Invite user page
(cherry picked from commit 2a2c832e0bf4ca6b366fd6f98c99a2081f1d09bf)
2025-06-23 07:54:20 +00:00
Shariq Ansari
4ed8a54a98 fix: renamed component names from Agent to User
(cherry picked from commit b534aae70bc6304c818ef33e05c8a0a50146a4cf)
2025-06-23 07:54:20 +00:00
Shariq Ansari
c918a76635 fix: renamed & added role with filter
(cherry picked from commit 6d3e4406ae52dd4d6a6966fc03a42e300b53469d)
2025-06-23 07:54:19 +00:00
Shariq Ansari
58c500df1f fix: renamed Agent to User in Settings
(cherry picked from commit 463d60b650e6f3071c421998df43fa801ca60c41)
2025-06-23 07:54:19 +00:00
Shariq Ansari
a86884e40e fix: activate/deactivate agent
(cherry picked from commit 0a836c78bb45a5e0eaa27142ea07fc7b063b5b09)
2025-06-23 07:54:18 +00:00
Shariq Ansari
dd4f5c6f80 fix: renamed invite members to invite agent
(cherry picked from commit 5c7f835e4c2d6400302c3466ab0b8c9d655bf274)
2025-06-23 07:54:18 +00:00
Shariq Ansari
f7344cde43 fix: show and allow changing role from agents settings page
(cherry picked from commit 346849631eb2ac886b6bf796d355f3891217ff9f)
2025-06-23 07:54:17 +00:00
Shariq Ansari
b0341aebde fix: added get user role in users store
(cherry picked from commit bf166bdaad6c775be2dd83c7097265ee3c29b3ef)
2025-06-23 07:54:17 +00:00
Shariq Ansari
909670d234 fix: removed x button from settings modal
(cherry picked from commit 123f183f68edd93fdae02ca35c2ca40f540a764a)
2025-06-23 07:54:17 +00:00
Shariq Ansari
5deef03fd7 fix: added Agents page in settings
(cherry picked from commit bea1505c63603309fd1eb2d0b59f804ea6b6b65c)
2025-06-23 07:54:16 +00:00
Shariq Ansari
6f2638a3d9 build(deps): bump frappeui to 0.1.156
(cherry picked from commit 548018997e5d5a26a92535c580622ad6518bb961)
2025-06-16 12:19:05 +00:00
Shariq Ansari
46ed866de6 fix: updated button with icon
(cherry picked from commit 9f3477e1cd43c7aa8144b661e7bed7ee7e8dd53b)
2025-06-16 12:19:05 +00:00
Shariq Ansari
95cd3f256e fix: fixed breaking button with icon and open email box
(cherry picked from commit baa03246e647a3abb02e1dd7281da18a0a362fef)
2025-06-16 12:19:04 +00:00