Shariq Ansari
|
4d619a908c
|
fix: update button state to use document properties
(cherry picked from commit 41118eda97b9aeaa47814c2c499dc8e4c6f57b47)
|
2025-08-21 06:03:21 +00:00 |
|
Shariq Ansari
|
89abee30bf
|
fix: dropdown item is not updating
(cherry picked from commit 8ea94765ce351df2586ab71238ef6baa8068613e)
|
2025-08-20 07:45:21 +00:00 |
|
Shariq Ansari
|
d0dc642b12
|
refactor: Button components across multiple files to use icon/left-icon/right-icon prop
(cherry picked from commit 672c5eb7333fe4c48055f0acc2d287d545015970)
|
2025-08-18 17:10:21 +00:00 |
|
Shariq Ansari
|
d4ac8772ae
|
fix: add toast import to CurrencySettings component
(cherry picked from commit 68d1172b8fee86603586b21271ff5dc3f627734b)
|
2025-08-18 17:10:20 +00:00 |
|
Shariq Ansari
|
97d9866c0e
|
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-1084
|
2025-07-28 18:17:45 +05:30 |
|
Shariq Ansari
|
03bc281763
|
fix: fixed labels
(cherry picked from commit 4c7a40d8bc882110784dff7a8db63a44fbd9d243)
# Conflicts:
# frontend/src/components/Settings/General/CurrencySettings.vue
# frontend/src/components/Settings/General/GeneralSettings.vue
|
2025-07-28 12:36:17 +00:00 |
|
Shariq Ansari
|
30cc791cc7
|
fix: remove unused Link component import from GeneralSettings.vue
(cherry picked from commit c72160b2a491ce440458911813859e5a94548777)
|
2025-07-28 12:28:28 +00:00 |
|
Shariq Ansari
|
acf47d7570
|
fix: update description for mandatory fields in deal value forecasting
(cherry picked from commit e06a3650294c73deb206d0332219b3e2f80e3688)
|
2025-07-28 12:28:28 +00:00 |
|
Shariq Ansari
|
14a9571fdc
|
fix: added exchange rate provider & currency together in settings modal
(cherry picked from commit 36e79e49da2091dfca166f1c50452285577d7584)
|
2025-07-28 12:28:27 +00:00 |
|
Shariq Ansari
|
b369211965
|
fix: better description
(cherry picked from commit cbc127e9470462a79ae5ef1c85590493eaf225a5)
|
2025-07-10 11:53:09 +00:00 |
|
Shariq Ansari
|
c1983e8241
|
style: better spacing
(cherry picked from commit 328959cc394b7fd7b27403507bce91b855f87d2e)
|
2025-07-10 11:53:09 +00:00 |
|
Shariq Ansari
|
95773bec71
|
chore: minor fix
(cherry picked from commit faeacb9a7d87d5bcf6f0bbd904cb619b3fe84145)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
d75cde4bb0
|
fix: added forecasting & currency setting in general settings
(cherry picked from commit 5dcd416007e5f9e0515f2525deaa88323cedc11b)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
f733ef2fe7
|
refactor: general settings
(cherry picked from commit c7fbd6f8f15b73fa2d69065eac32a014fef2596c)
|
2025-07-10 11:53:08 +00:00 |
|
Shariq Ansari
|
39a419889f
|
fix: only show sales user filter to manager
(cherry picked from commit f747e076ab6b1bc58eb4aa14fe01628317c0b2eb)
|
2025-07-10 11:53:05 +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
|
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
|
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
|
af6994f8fc
|
fix: make header sticky
(cherry picked from commit 3c1ce1fe2741a5d2f4faa4a0a5be71f188439f07)
|
2025-06-24 06:42:49 +00:00 |
|
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
|
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
|
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
|
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 |
|