Shariq Ansari
|
7dd98733f1
|
chore: resolved conflict
|
2025-09-18 15:38:44 +05:30 |
|
Shariq Ansari
|
ee4b7721b0
|
chore: resolved conflict
|
2025-09-18 15:37:11 +05:30 |
|
Shariq Ansari
|
95bc551254
|
chore: resolved conflict
|
2025-09-18 15:35:03 +05:30 |
|
Shariq Ansari
|
2546bdabb1
|
refactor: adjust padding and improve layout for Settings component
(cherry picked from commit d687a2eb56142c49b2b776dec55ad533556421f6)
|
2025-09-18 09:59:25 +00:00 |
|
Shariq Ansari
|
af248964c6
|
refactor: adjust padding and improve layout for Currency and Forecasting settings components
(cherry picked from commit 1044adc494b0b5b7f347aaf0080914a28be56eb9)
|
2025-09-18 09:59:25 +00:00 |
|
Shariq Ansari
|
8749f7bfd0
|
refactor: update styling and improve layout for assignment rules components
(cherry picked from commit 9f95a3a2b2132357708db03b9b4922f356150ff4)
|
2025-09-18 09:59:25 +00:00 |
|
Shariq Ansari
|
d18618b856
|
refactor: replace EmailMultiSelect with FormControl for inviting users by email
(cherry picked from commit 69f80903118965f500199f1b3368deb195882699)
# Conflicts:
# frontend/src/components/Settings/InviteUserPage.vue
|
2025-09-18 09:59:24 +00:00 |
|
Shariq Ansari
|
ce4af4907a
|
refactor: remove TemplateOption component usage and simplify dropdown options in multiple components
(cherry picked from commit ac34ac9b87b9c671be75401a545e09e0e83ac378)
# Conflicts:
# frontend/src/components/Settings/Users.vue
|
2025-09-18 09:59:24 +00:00 |
|
Shariq Ansari
|
be452fee58
|
refactor: reduce gap in Brand logo and Favicon sections for improved layout
(cherry picked from commit fbc9e37036d5720948381ca891714d78af001433)
|
2025-09-18 09:59:23 +00:00 |
|
Shariq Ansari
|
100eec0677
|
refactor: remove icon-left from Update button in multiple settings components
(cherry picked from commit 149901f6054f000d503ef8940037c13bd2e344f3)
|
2025-09-18 09:59:23 +00:00 |
|
Shariq Ansari
|
a4d3852c0e
|
feat: Auto update expected deal value based on products value
(cherry picked from commit 7e21a5fee206723cf714f7a8732bb8929aaa57df)
|
2025-09-18 09:59:23 +00:00 |
|
Shariq Ansari
|
0399fc32be
|
refactor: add ForecastingSettings component and remove GeneralSettingsPage component
(cherry picked from commit f4ff6bbdf306a89b78aab82df972bf55e1e0d82d)
|
2025-09-18 09:59:22 +00:00 |
|
Shariq Ansari
|
e10ec543a7
|
refactor: CurrencySettings component
(cherry picked from commit 186584c1ac79170afa4ef8860bff9d3d3d91cadc)
|
2025-09-18 09:59:22 +00:00 |
|
Shariq Ansari
|
1962b9a103
|
refactor: update BrandSettings component to improve logo and favicon handling
(cherry picked from commit 3752c611576778f028ba78d6c1ae533a88c6040b)
|
2025-09-18 09:59:21 +00:00 |
|
Shariq Ansari
|
a3abaa57ec
|
refactor: HomeActions component
(cherry picked from commit a6ecc5cfeda51781286d013cf3a738b8a3adfdc5)
|
2025-09-18 09:59:21 +00:00 |
|
Shariq Ansari
|
1bf3f7a38c
|
refactor: BrandSettings component
(cherry picked from commit 84e0fe30a9667468ea9ddbb0bc768e3da62620d3)
|
2025-09-18 09:59:20 +00:00 |
|
Shariq Ansari
|
af81750388
|
refactor: enhance Settings component structure
(cherry picked from commit 03acea69b130cfdbdc00994c8d9930ad948cb64c)
# Conflicts:
# frontend/src/components/Settings/Settings.vue
|
2025-09-18 09:59:20 +00:00 |
|
Shariq Ansari
|
7ef00965fa
|
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-1252
|
2025-09-18 15:21:52 +05:30 |
|
Pratik Badhe
|
d985a44291
|
feat: add assignment rule
(cherry picked from commit 0c5684905f44af211189bf674735b046858a5b86)
# Conflicts:
# frontend/components.d.ts
# yarn.lock
|
2025-09-18 09:19:54 +00:00 |
|
Pratik Badhe
|
004923419c
|
fix: paddings and labels
(cherry picked from commit db577afc568b56b49846773b16b638e0cf1444fa)
# Conflicts:
# frontend/src/components/Settings/AssignmentRules/AssigneeRules.vue
# frontend/src/components/Settings/AssignmentRules/AssignmentRuleView.vue
# frontend/src/components/Settings/AssignmentRules/AssignmentRules.vue
|
2025-09-17 06:47:25 +00:00 |
|
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 |
|