|
|
d723f3e3cc
|
merge main into websitefinal
|
2026-04-15 12:26:31 -06:00 |
|
|
|
15e08834a0
|
Merge pull request #308 from RecentRunner/azure-deploy
merge azure-deploy
|
2026-04-15 12:25:46 -06:00 |
|
|
|
db8499e18d
|
point android app at azure backend
|
2026-04-15 08:13:53 -06:00 |
|
Nikitha
|
8e1ab89e6c
|
Chat Widget, changes in nav bar
Auto Scroll chat and changes in Nav bar
|
2026-04-15 08:12:16 -06:00 |
|
|
|
6046d8720f
|
point desktop app at azure backend
|
2026-04-15 08:10:17 -06:00 |
|
|
|
fc0712cc78
|
fix chat scroll jumps and move about us to home page
|
2026-04-15 08:07:17 -06:00 |
|
|
|
3d0e05daf2
|
fix proxy origin header and cors allowed origins config
|
2026-04-15 07:37:43 -06:00 |
|
|
|
839963049d
|
Merge pull request #307 from RecentRunner/web-v2
merge web-v2
|
2026-04-15 07:07:34 -06:00 |
|
|
|
ecea09afc6
|
Merge pull request #306 from RecentRunner/fix-appointment-history
fix appointment history
|
2026-04-15 07:04:46 -06:00 |
|
|
|
d40904b5cd
|
fix appointment history
|
2026-04-15 07:04:22 -06:00 |
|
|
|
b782e4e62b
|
Merge pull request #305 from RecentRunner/web-fixes
fix appointments and pagination
|
2026-04-15 06:53:09 -06:00 |
|
|
|
fb2b070e32
|
fix appointments and pagination
|
2026-04-15 06:52:49 -06:00 |
|
augmentedpotato
|
85653af39e
|
Small corrections
|
2026-04-15 06:39:41 -06:00 |
|
augmentedpotato
|
cdcc50e93a
|
Minor change to appointments page
|
2026-04-15 02:49:26 -06:00 |
|
augmentedpotato
|
914e0bceda
|
Points now subtract from costs
|
2026-04-15 02:44:14 -06:00 |
|
Alex
|
7ad35bd2dc
|
Merge branch 'AttachmentsToChat'
|
2026-04-15 02:15:16 -06:00 |
|
Alex
|
1163961b90
|
fixed product supplier android
|
2026-04-15 02:14:20 -06:00 |
|
Alex
|
a2c8df16b7
|
added filtering to activity logs for desktop
|
2026-04-15 02:10:20 -06:00 |
|
Alex
|
a23171359f
|
turned logs to laymen terms and added to android
|
2026-04-15 01:52:35 -06:00 |
|
|
|
404f162728
|
Merge pull request #304 from RecentRunner/web-coupons
web coupons
|
2026-04-15 01:39:43 -06:00 |
|
|
|
bd7368f0cf
|
Merge pull request #303 from RecentRunner/chat-ui-updates
chat UI updates
|
2026-04-15 01:37:52 -06:00 |
|
|
|
fb7d71c86e
|
unify ai and live chat
|
2026-04-15 01:35:54 -06:00 |
|
augmentedpotato
|
2c1871b6e2
|
loyalty points
|
2026-04-15 01:34:49 -06:00 |
|
|
|
f22a187148
|
always show chat sidebar
|
2026-04-15 01:31:29 -06:00 |
|
|
|
28ccf8b96d
|
Merge pull request #302 from RecentRunner/web-features
fix web chat features
|
2026-04-15 01:25:47 -06:00 |
|
|
|
377439495c
|
fix web chat features
|
2026-04-15 01:25:28 -06:00 |
|
Alex
|
c8a1c29cc3
|
removed status on purchase order android
|
2026-04-15 01:09:56 -06:00 |
|
|
|
3214d3893b
|
fix chat scroll and button
|
2026-04-15 01:09:09 -06:00 |
|
|
|
5817f82b77
|
fix contact form style
|
2026-04-15 00:56:24 -06:00 |
|
|
|
ad63a314c9
|
add store images
|
2026-04-15 00:55:08 -06:00 |
|
augmentedpotato
|
1636ba14b6
|
Coupon system working properly
|
2026-04-15 00:54:46 -06:00 |
|
|
|
0315920b0d
|
Merge pull request #301 from RecentRunner/web-fixes
web fixes
|
2026-04-15 00:49:04 -06:00 |
|
Alex
|
4643feb868
|
added pagenation to android for each fragment
|
2026-04-15 00:46:32 -06:00 |
|
|
|
a3eff2e738
|
contact form with email
|
2026-04-15 00:46:32 -06:00 |
|
|
|
2e13c0cea0
|
web issue fixes
|
2026-04-15 00:44:07 -06:00 |
|
|
|
023fdf5ee9
|
web fixes
|
2026-04-15 00:38:04 -06:00 |
|
|
|
7d3cc51c8f
|
Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop
|
2026-04-15 00:27:49 -06:00 |
|
|
|
fe8fdafdd8
|
Merge pull request #300 from RecentRunner/web-pwreset
web password reset
|
2026-04-15 00:27:40 -06:00 |
|
Alex
|
024a618473
|
fixed issue for desktop when sending a file too large
|
2026-04-15 00:27:06 -06:00 |
|
|
|
f194d7ca78
|
Merge branch 'main' of github.com:RecentRunner/group-2-threaded-project-petshop
|
2026-04-15 00:18:43 -06:00 |
|
augmentedpotato
|
755fa092c2
|
password reset
|
2026-04-15 00:17:26 -06:00 |
|
|
|
8cf12d32d3
|
merge azure-deploy
|
2026-04-15 00:14:09 -06:00 |
|
Alex
|
017ef65b5a
|
desktop chat now shows images
|
2026-04-15 00:00:17 -06:00 |
|
|
|
934a857cdf
|
document BACKEND_URL swap
|
2026-04-14 23:46:38 -06:00 |
|
|
|
6c4fc20870
|
add desktop backend config
|
2026-04-14 23:46:21 -06:00 |
|
Alex
|
be697f080e
|
Merge branch 'AttachmentsToChat'
|
2026-04-14 23:43:39 -06:00 |
|
Alex
|
6235f96def
|
added time stamp and sender name to android chat
|
2026-04-14 23:42:23 -06:00 |
|
Alex
|
4f6a6f71ed
|
fixed chat messaging on same account with different devices
|
2026-04-14 23:34:07 -06:00 |
|
|
|
de37b27fcc
|
Merge remote-tracking branch 'origin/main' into azure-deploy
|
2026-04-14 23:32:16 -06:00 |
|
|
|
0b244938cf
|
Merge pull request #299 from RecentRunner/web-v1
Merge web-v1 into main
|
2026-04-14 23:29:51 -06:00 |
|
