test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,907 Commits 192 Branches 169 Tags
Commit Graph

149 Commits

Author SHA1 Message Date
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
e267445a80 fix: layout change 
(cherry picked from commit 0ad65be961ff70f069be78979004820d827a96d0)
 2025-06-23 07:54:30 +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
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
7fbda3ec9c fix: use crmUsers in comment box 
(cherry picked from commit 85191e10c881490ae420156798a320935a9c6fa2)
 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
a6e8e64d49 fix: use validateIsImageFile from utils 
(cherry picked from commit 15fd763de8cb4cb9045a4e68f0647b6dc21f32cc)
 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
de7cf372e7 fix: only show users to manager 
(cherry picked from commit 22856351fd9613f654df319f1714aafc5c4f626f)
 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
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
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
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
mahsem
fb330c26d2 fix: add context for Integrations 
(cherry picked from commit 33e6b80d5aa72b6b52fa4991f537e4fa4200e300)
 2025-06-11 05:43:57 +00:00
Hussain Nagaria
6224c3eadc refactor: DRY up validate image file 
* Also, allows more types of image files

(cherry picked from commit c6ad10857a3241fc2b9741d0298db034b01b789c)

# Conflicts:
#	frontend/src/pages/Contact.vue
#	frontend/src/pages/Lead.vue
#	frontend/src/pages/MobileContact.vue
 2025-06-08 07:19:55 +00:00
Shariq Ansari
d15f232060 fix: use toast.create api instead of createToast 
(cherry picked from commit 6064ca5a4fd51b188df85394963ea73bea4b97a5)
 2025-05-20 09:09:01 +00:00
Shariq Ansari
8b3cac75fb fix: added update your password step in onboarding 
(cherry picked from commit dd1db8f78249f1d06889387b67e6d38c7acae208)
 2025-05-20 08:40:52 +00:00
Shariq Ansari
3ea056d3df feat: added password control 
(cherry picked from commit fe8e309399d7f8f61e6a1388cf1820f07efc571f)
 2025-05-20 08:40:51 +00:00
Shariq Ansari
620839cb2f fix: do not show contacts in dropdown in invite member page 
(cherry picked from commit 4cfa0f512b0b28378cbb6dc0c4f4d5e6267812a0)
 2025-05-20 08:40:51 +00:00
Shariq Ansari
4e6577bb4d feat: added trigger function on row add & remove 
(cherry picked from commit 336083a00f3e71c8cc07477f6bf98131d7400f41)
 2025-05-09 14:55:52 +00:00
Pratik
73b39d58fb fix: merge conflict 2025-04-22 15:55:06 +05:30
Pratik
b28c6b94f1 chore: add localization support for email account settings 
(cherry picked from commit 5eb46f6b6cd528c22a0d01cd564c7209d4ee78b4)

# Conflicts:
#	frontend/src/components/Settings/emailConfig.ts
 2025-04-22 10:10:09 +00:00
Pratik Badhe
a921be33b3
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-753 2025-04-22 14:33:16 +05:30
Pratik
5b9539245d feat: add email account 
(cherry picked from commit 87174f207dc4fe60706b9c1d9b6be7b5a19628f9)
 2025-04-22 08:40:28 +00:00
Pratik
7c4a697b9f fix: dark mode email account css 
(cherry picked from commit 9c45877999234e72fed113639b767fb7594b66f6)

# Conflicts:
#	frontend/src/components/Settings/EmailAccountCard.vue
#	frontend/src/components/Settings/EmailAccountList.vue
#	frontend/src/components/Settings/EmailAdd.vue
#	frontend/src/components/Settings/EmailEdit.vue
#	frontend/src/components/Settings/EmailProviderIcon.vue
 2025-04-16 12:41:14 +00:00
Shariq Ansari
7b108f945d fix: disable send invite button if email is not added 2025-03-22 15:39:52 +05:30
Shariq Ansari
d423c0e7ce fix: use multi select email input in invite member settings 2025-03-22 15:37:20 +05:30
Shariq Ansari
ff52cf33d1 fix: button inside tooltip is triggered twice 2025-03-22 14:37:37 +05:30
Shariq Ansari
87bed3890b fix: use onboarding/help components & composable from frappe-ui/frappe 2025-03-19 14:49:44 +05:30
Shariq Ansari
041fef9b09 fix: import onboarding components & composables from frappe-ui/src/frappe 2025-03-19 00:50:55 +05:30
Shariq Ansari
46eb2395d1 fix: import onboarding components & composables from frappe-ui/frappe 2025-03-18 20:47:58 +05:30
Shariq Ansari
c1e0ace84b fix: use useOnboading composable from frappe-ui 2025-03-18 13:33:46 +05:30
Shariq Ansari
1a08480f6b
Merge branch 'develop' into onboarding 2025-03-12 21:55:34 +05:30
Shariq Ansari
b91521df5a fix: update onboarding status when invite is sent 2025-03-12 17:03:54 +05:30
Shariq Ansari
5b99863974 fix(UX): added description to which says press enter to add email 2025-03-12 16:59:55 +05:30
Shariq Ansari
b5add306c3 fix: added steps with icon in help modal 2025-03-12 13:43:42 +05:30