|
|
762f01ae71
|
fix deploy commands
|
2026-04-15 12:40:15 -06:00 |
|
|
|
64ce8ffba7
|
fix CI azure login
|
2026-04-15 12:36:07 -06:00 |
|
|
|
ea7e7e3825
|
Merge pull request #309 from RecentRunner/websitefinal
merge websitefinal
|
2026-04-15 12:26:47 -06:00 |
|
|
|
ea4b2292e8
|
merge main into websitefinal
|
2026-04-15 12:26:31 -06:00 |
|
|
|
01660ae4a1
|
Merge pull request #308 from RecentRunner/azure-deploy
merge azure-deploy
|
2026-04-15 12:25:46 -06:00 |
|
|
|
6bce625b12
|
point android app at azure backend
|
2026-04-15 08:13:53 -06:00 |
|
Nikitha
|
2fa7b99966
|
Chat Widget, changes in nav bar
Auto Scroll chat and changes in Nav bar
|
2026-04-15 08:12:16 -06:00 |
|
|
|
a22e47eabc
|
point desktop app at azure backend
|
2026-04-15 08:10:17 -06:00 |
|
|
|
50f8606ba8
|
fix chat scroll jumps and move about us to home page
|
2026-04-15 08:07:17 -06:00 |
|
|
|
bbda43e4a0
|
fix proxy origin header and cors allowed origins config
|
2026-04-15 07:37:43 -06:00 |
|
|
|
5c85c43d5e
|
Merge pull request #307 from RecentRunner/web-v2
merge web-v2
|
2026-04-15 07:07:34 -06:00 |
|
|
|
17ae8f95c0
|
Merge pull request #306 from RecentRunner/fix-appointment-history
fix appointment history
|
2026-04-15 07:04:46 -06:00 |
|
|
|
c18851fba8
|
fix appointment history
|
2026-04-15 07:04:22 -06:00 |
|
|
|
824fea942f
|
Merge pull request #305 from RecentRunner/web-fixes
fix appointments and pagination
|
2026-04-15 06:53:09 -06:00 |
|
|
|
0a309598fc
|
fix appointments and pagination
|
2026-04-15 06:52:49 -06:00 |
|
augmentedpotato
|
c37650d942
|
Small corrections
|
2026-04-15 06:39:41 -06:00 |
|
augmentedpotato
|
78a8992f71
|
Minor change to appointments page
|
2026-04-15 02:49:26 -06:00 |
|
augmentedpotato
|
dfc3d627c8
|
Points now subtract from costs
|
2026-04-15 02:44:14 -06:00 |
|
Alex
|
10ddb4ffdd
|
Merge branch 'AttachmentsToChat'
|
2026-04-15 02:15:16 -06:00 |
|
Alex
|
7f5b0cceb1
|
fixed product supplier android
|
2026-04-15 02:14:20 -06:00 |
|
Alex
|
73b99b4aa0
|
added filtering to activity logs for desktop
|
2026-04-15 02:10:20 -06:00 |
|
Alex
|
0cf7144387
|
turned logs to laymen terms and added to android
|
2026-04-15 01:52:35 -06:00 |
|
|
|
47f60dc309
|
Merge pull request #304 from RecentRunner/web-coupons
web coupons
|
2026-04-15 01:39:43 -06:00 |
|
|
|
cae0f23522
|
Merge pull request #303 from RecentRunner/chat-ui-updates
chat UI updates
|
2026-04-15 01:37:52 -06:00 |
|
|
|
b029500553
|
unify ai and live chat
|
2026-04-15 01:35:54 -06:00 |
|
augmentedpotato
|
da115fd824
|
loyalty points
|
2026-04-15 01:34:49 -06:00 |
|
|
|
03c8033540
|
always show chat sidebar
|
2026-04-15 01:31:29 -06:00 |
|
|
|
d34c8f34ca
|
Merge pull request #302 from RecentRunner/web-features
fix web chat features
|
2026-04-15 01:25:47 -06:00 |
|
|
|
638b15fb40
|
fix web chat features
|
2026-04-15 01:25:28 -06:00 |
|
Alex
|
7b176fe938
|
removed status on purchase order android
|
2026-04-15 01:09:56 -06:00 |
|
|
|
f9cd2ed758
|
fix chat scroll and button
|
2026-04-15 01:09:09 -06:00 |
|
|
|
873c1bbb38
|
fix contact form style
|
2026-04-15 00:56:24 -06:00 |
|
|
|
db756d95c4
|
add store images
|
2026-04-15 00:55:08 -06:00 |
|
augmentedpotato
|
3f5add59e8
|
Coupon system working properly
|
2026-04-15 00:54:46 -06:00 |
|
|
|
14e4f4ca72
|
Merge pull request #301 from RecentRunner/web-fixes
web fixes
|
2026-04-15 00:49:04 -06:00 |
|
Alex
|
6a082fc8f1
|
added pagenation to android for each fragment
|
2026-04-15 00:46:32 -06:00 |
|
|
|
0e1eb056a4
|
contact form with email
|
2026-04-15 00:46:32 -06:00 |
|
|
|
f45330a451
|
web issue fixes
|
2026-04-15 00:44:07 -06:00 |
|
|
|
3111553009
|
web fixes
|
2026-04-15 00:38:04 -06:00 |
|
|
|
51a03fe2c5
|
Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop
|
2026-04-15 00:27:49 -06:00 |
|
|
|
95d4c84ed8
|
Merge pull request #300 from RecentRunner/web-pwreset
web password reset
|
2026-04-15 00:27:40 -06:00 |
|
Alex
|
f66eb12729
|
fixed issue for desktop when sending a file too large
|
2026-04-15 00:27:06 -06:00 |
|
|
|
bbecc168a0
|
Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop
|
2026-04-15 00:18:43 -06:00 |
|
augmentedpotato
|
535004bced
|
password reset
|
2026-04-15 00:17:26 -06:00 |
|
|
|
6788afc3d2
|
merge azure-deploy
|
2026-04-15 00:14:09 -06:00 |
|
Alex
|
3167e2c68b
|
desktop chat now shows images
|
2026-04-15 00:00:17 -06:00 |
|
|
|
13ce9a9cc7
|
document BACKEND_URL swap
|
2026-04-14 23:46:38 -06:00 |
|
|
|
1dc87b0c06
|
add desktop backend config
|
2026-04-14 23:46:21 -06:00 |
|
Alex
|
5cf5265451
|
Merge branch 'AttachmentsToChat'
|
2026-04-14 23:43:39 -06:00 |
|
Alex
|
1114982553
|
added time stamp and sender name to android chat
|
2026-04-14 23:42:23 -06:00 |
|