Shariq Ansari
|
803e639961
|
build(deps): bump frappeui to 0.1.200
(cherry picked from commit 96c0c99939b30880ddf27b91f3f6b18c95ef3409)
|
2025-09-22 09:40:21 +00:00 |
|
Shariq Ansari
|
fabd362b2a
|
Merge pull request #1260 from frappe/mergify/bp/main-hotfix/pr-1256
|
2025-09-18 15:44:32 +05:30 |
|
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
|
84d24a384b
|
refactor: update Vite configuration to support dynamic loading of frappe-ui in development mode
(cherry picked from commit 129f8a00b66d87529c21ef085e66dc7864a3776e)
|
2025-09-18 09:59:24 +00:00 |
|
Shariq Ansari
|
29d86859d4
|
revert: create dynamic alias to use components from frontend vue apps
(cherry picked from commit 6328b6941bb620e47cebe82519df3f1453f355ae)
|
2025-09-18 09:59:23 +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
|
a79192ef4d
|
fix: add auto-update expected deal value checkbox in FCRM settings
(cherry picked from commit 915023317310178d67306bb6d8b48e224e5644ae)
|
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
|
7330a3c2a5
|
refactor: clean up ImageUploader component and improve label handling
(cherry picked from commit e19f75083147faaf988bcbef448e9d1ddbb9179a)
|
2025-09-18 09:59:19 +00:00 |
|
Shariq Ansari
|
9e8a4024a5
|
Merge pull request #1255 from frappe/mergify/bp/main-hotfix/pr-1252
fix: paddings and labels (backport #1252)
|
2025-09-18 15:27:27 +05:30 |
|
Shariq Ansari
|
7ef00965fa
|
Merge branch 'main-hotfix' into mergify/bp/main-hotfix/pr-1252
|
2025-09-18 15:21:52 +05:30 |
|
Shariq Ansari
|
97925aae15
|
Merge pull request #1259 from frappe/mergify/bp/main-hotfix/pr-1257
|
2025-09-18 15:17:19 +05:30 |
|
Shariq Ansari
|
0b75228722
|
chore: Portuguese translations
(cherry picked from commit fca831b92e633f7a7f6cdd09f66d83bac19e2590)
|
2025-09-18 09:42:12 +00:00 |
|
Shariq Ansari
|
a360fa774b
|
Merge pull request #1258 from frappe/mergify/bp/main-hotfix/pr-1206
|
2025-09-18 15:11:28 +05:30 |
|
Shariq Ansari
|
4601b56ee1
|
chore: resolved conflict
|
2025-09-18 15:05:35 +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
|
ce66705e9c
|
revert: yarn.lock file
(cherry picked from commit 41ef219d0abd0c0036d7697dc5a8b8ab78a81344)
|
2025-09-17 06:47:25 +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
|
49ed1ac174
|
Merge pull request #1254 from frappe/mergify/bp/main-hotfix/pr-1253
|
2025-09-17 11:55:38 +05:30 |
|
Shariq Ansari
|
a7dd1e9bf6
|
chore: Norwegian Bokmal translations
(cherry picked from commit b6e3cdfc378c9ab6322e6148d28387e5d399310c)
|
2025-09-17 06:08:01 +00:00 |
|
Shariq Ansari
|
4cfd0022f4
|
chore: Danish translations
(cherry picked from commit c0171c0555fe7091102b12cd2ccd8ec714dbe34d)
|
2025-09-17 06:08:00 +00:00 |
|
Shariq Ansari
|
fc3d8cd94d
|
chore: Esperanto translations
(cherry picked from commit 6f154e191a816c118ffc190a36277ea9235eedc3)
|
2025-09-17 06:08:00 +00:00 |
|
Shariq Ansari
|
5473a93b5e
|
chore: Croatian translations
(cherry picked from commit 552e500a31bca989d7b4554cfc0aa0015635098c)
|
2025-09-17 06:08:00 +00:00 |
|
Shariq Ansari
|
57d306ea1f
|
chore: Thai translations
(cherry picked from commit bf6940a6ff7cd972c384a050068aaa2835bc371a)
|
2025-09-17 06:07:59 +00:00 |
|
Shariq Ansari
|
7c324bd07f
|
chore: Persian translations
(cherry picked from commit dc9b07b02a5ea4443967d3261781d2786e7ff810)
|
2025-09-17 06:07:59 +00:00 |
|
Shariq Ansari
|
09421217b4
|
chore: Vietnamese translations
(cherry picked from commit 0a45094c33db76bea8606c02b2b0985e6e35e34f)
|
2025-09-17 06:07:59 +00:00 |
|
Shariq Ansari
|
630dfcd0e7
|
chore: Chinese Simplified translations
(cherry picked from commit 247d8e043e548d30ffc4494544cdf7e95bec94e1)
|
2025-09-17 06:07:58 +00:00 |
|
Shariq Ansari
|
b999a375b3
|
chore: Turkish translations
(cherry picked from commit 73a1ecd418e0ca1ba40442aa0338b7f6853d0650)
|
2025-09-17 06:07:58 +00:00 |
|
Shariq Ansari
|
b5f5a3b5d5
|
chore: Russian translations
(cherry picked from commit 77e7bb011b5357465f6565eeddddd4ec160c1d3c)
|
2025-09-17 06:07:57 +00:00 |
|
Shariq Ansari
|
814d39572a
|
chore: Portuguese translations
(cherry picked from commit 9233e77ab8376301a61c56d4ee072fb3c4caea4b)
|
2025-09-17 06:07:57 +00:00 |
|
Shariq Ansari
|
6fc4c0699a
|
chore: Dutch translations
(cherry picked from commit 32e5d56ef19da5c0577334992a43d3c0db761700)
|
2025-09-17 06:07:57 +00:00 |
|
Shariq Ansari
|
50ea06a568
|
chore: Hungarian translations
(cherry picked from commit cea6b6c6b4bfe87e6c533aadba632f60081853bc)
|
2025-09-17 06:07:56 +00:00 |
|
Shariq Ansari
|
daf0ddaab4
|
chore: Czech translations
(cherry picked from commit 2d636d7ffb252e52352e0883747c6fb158d42774)
|
2025-09-17 06:07:56 +00:00 |
|
Shariq Ansari
|
70107a4836
|
chore: Arabic translations
(cherry picked from commit 9d9caf2856b5fd1c1f5bc88024292a2dea3dd1f3)
|
2025-09-17 06:07:56 +00:00 |
|
Shariq Ansari
|
f2e6380d3e
|
chore: Spanish translations
(cherry picked from commit 4ff4f3c5b53fe6ea60623894770ecad3b2289441)
|
2025-09-17 06:07:56 +00:00 |
|
Shariq Ansari
|
eed1e23b5b
|
chore: French translations
(cherry picked from commit 8167e1388da8693ab2d14dba876d7092a40d1875)
|
2025-09-17 06:07:55 +00:00 |
|