Commit Graph

268 Commits

Author SHA1 Message Date
bf81873033 (feat) - explore page modified (2.74.0)
(fix) - error fixed
2025-10-18 17:05:47 +03:30
Reza Taghizadeh
132cac92b7 fix: resolve banner issue (v2.73.3) 2025-10-18 16:03:10 +03:30
10f51be1f8 Merge branch 'reza-dev' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-10-18 16:01:32 +03:30
Reza Taghizadeh
53f00f6d81 fix: resolve banner issue 2025-10-18 15:59:06 +03:30
244c33d473 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into farnoosh-dev 2025-10-18 15:41:46 +03:30
Reza Taghizadeh
0f9a0faa6f Merge branch 'farnoosh-dev' of https://github.com/sinmajidi/Salona-new-version into reza-dev 2025-10-18 15:41:21 +03:30
1b07e81170 (feat) - modify QR code appearance
(feat) - Add remaining SMS count section to profile
(err) - update advisor image on homepage (with issue)
2025-10-18 15:34:58 +03:30
Reza Taghizadeh
d9cb409c67 Merge pull request #9 from sinmajidi/reza-dev
Reza dev
2025-10-18 14:45:02 +03:30
Reza Taghizadeh
0244bce2ea fix: clean code for builds 2025-10-18 14:42:49 +03:30
Reza Taghizadeh
db6daa9754 feat: add feature to callandare and connect some api, resolve some bugs (v2.73.2) 2025-10-18 14:38:55 +03:30
34ccf7e641 2.72.1 2025-10-15 19:54:00 +03:30
af209e3bc0 bug fixed 2025-10-15 19:53:54 +03:30
d4e0b0c7cf 2.72.0 2025-10-15 19:45:41 +03:30
a28d6735c3 (fix) - gift-card: resolved UI and logic issues
(feat) - loyalty-card: completed UI and integrated with backend (view, delete, edit)
2025-10-15 19:42:41 +03:30
Reza Taghizadeh
00684300b6 Merge pull request #8 from sinmajidi/reza-dev
fix: resolve bugs (v2.71.2)
2025-10-15 00:11:29 +03:30
Reza Taghizadeh
9c48c82b4f fix: resolve bugs (v2.71.2) 2025-10-15 00:10:46 +03:30
Reza Taghizadeh
31cc8b5706 Merge pull request #7 from sinmajidi/reza-dev
Reza dev
2025-10-15 00:09:29 +03:30
Reza Taghizadeh
640ebe2864 fix: resolve bugs (v2.71.0) 2025-10-15 00:08:46 +03:30
Reza Taghizadeh
3b817fa0e5 fix: get pull and resolve conflict (v2.71.0) 2025-10-14 23:54:37 +03:30
Reza Taghizadeh
e62330351d fix: get pull and resolve conflict (v2.71.0) 2025-10-14 23:54:23 +03:30
Reza Taghizadeh
1682651e29 feat: add api to oponinion sms and accounting pages 2025-10-14 23:18:35 +03:30
9662203eca 2.70.0 2025-10-14 19:37:41 +03:30
33ca77307d (feat) - Update profile and settings functionality
(feat) - Profile: Birthday, city, and province fields are now editable
(feat) - Specialties: Added list of specialties with edit functionality
(feat) - SMS settings: Connected to API with full edit capabilities
2025-10-14 19:32:24 +03:30
5684c7c001 2.69.0 2025-10-14 15:15:55 +03:30
12e230ae8a (feat) - scan gift card QR-code completed 2025-10-14 15:14:44 +03:30
f1c28bd667 2.68.0 2025-10-13 17:56:36 +03:30
8f091cb598 (feat) - Complete gift card creation feature
(fix) - Fixed gift cards not showing up until manual refresh in Explore page
(feat) - Added delete functionality for each gift card
(fix) - Fixed login flow: users without a phone number now go to questions page before registration
(fix) - Fixed daily feeling submission: now shows proper success/error messages
(fix) - Fixed quick appointment list: now requires selecting a day before showing time slots
(fix) - Fixed mobile layout issue on prizes page
(err) - QR code scanning is still not working
2025-10-13 17:52:12 +03:30
Reza Taghizadeh
f894bb2f61 feat: finish report-all ui and some func (v2.68.0) 2025-10-12 10:37:00 +03:30
Reza Taghizadeh
c272da2b0a Merge pull request #6 from erfan2220/reza-dev
Reza dev
2025-10-10 23:43:18 +03:30
Reza Taghizadeh
a0b1045c57 git pull from test 2025-10-10 23:42:27 +03:30
Reza Taghizadeh
ba4ae12d77 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-10 23:26:11 +03:30
cd3ee5fa33 2.67.0 2025-10-09 03:08:59 +03:30
fe50eeb1a8 (feat) - rose assistant completed (based on design1 in Figma) 2025-10-08 16:14:35 +03:30
Reza Taghizadeh
1f9a7ec551 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-08 14:16:48 +03:30
99b014c33b 2.66.0 2025-10-08 10:24:25 +03:30
0f651f2200 (feat) - rose assistant completed with skeleton design (design 2 in Figma) 2025-10-08 10:23:12 +03:30
7ef9b26330 merged 2025-10-07 19:02:36 +03:30
c264b461f3 2.65.0 2025-10-07 18:59:16 +03:30
c9481ec099 (feat): update Rose Assistant page based on new Figma design (partial) 2025-10-07 18:57:37 +03:30
Reza Taghizadeh
888c3f39c2 fix: resolve build bugs 2025-10-07 16:49:23 +03:30
Reza Taghizadeh
3bb57537d7 fix: resolve build bugs 2025-10-07 16:38:55 +03:30
Reza Taghizadeh
4cca0ed829 feat : add build config 2025-10-07 15:05:00 +03:30
Reza Taghizadeh
685f5ab547 fix : resolve pwa bugs 2025-10-07 14:47:03 +03:30
Reza Taghizadeh
4f670537af fix : resolve build bugs 2025-10-07 14:45:20 +03:30
Reza Taghizadeh
875765b87b fix : resolve pwa bugs 2025-10-07 14:41:24 +03:30
Reza Taghizadeh
20100c8345 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 13:33:10 +03:30
Reza Taghizadeh
5875b03de9 Merge branch 'main' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 13:30:52 +03:30
Reza Taghizadeh
5663e1e6bf Merge pull request #5 from erfan2220/reza-dev
fix: resolve some bugs
2025-10-07 00:32:28 +03:30
Reza Taghizadeh
7d1bfe9385 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 00:32:12 +03:30
Reza Taghizadeh
59268f2ff3 Revert "fix: resolve some bugs"
This reverts commit 77cfc1be3e.
2025-10-07 00:20:52 +03:30