Commit Graph

734 Commits

Author SHA1 Message Date
0a309598fc fix appointments and pagination 2026-04-15 06:52:49 -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
Alex
7847bf19cc fixed chat messaging on same account with different devices 2026-04-14 23:34:07 -06:00
e16e7f5f22 Merge remote-tracking branch 'origin/main' into azure-deploy 2026-04-14 23:32:16 -06:00
f940ac4c10 Merge pull request #299 from RecentRunner/web-v1
Merge web-v1 into main
2026-04-14 23:29:51 -06:00
a4beb245a4 merge main 2026-04-14 23:29:46 -06:00
Alex
2151ac56cd Merge branch 'AttachmentsToChat' 2026-04-14 23:20:16 -06:00
ca3e272fd9 lazy init 2026-04-14 23:19:34 -06:00
Alex
c5a59e8de3 made admin analyics able to select store 2026-04-14 23:17:12 -06:00
Alex
1b4a96c923 added personal and store analytics 2026-04-14 23:10:03 -06:00
1b873f7012 Merge remote-tracking branch 'origin/main' into azure-deploy 2026-04-14 23:06:48 -06:00
0c9feefeb5 show error details 2026-04-14 22:56:54 -06:00
Alex
08337145f0 Changed android phone validation 2026-04-14 22:53:42 -06:00
88bf6f8428 runtime backend proxy 2026-04-14 22:52:01 -06:00
a241024ced use middleware for runtime backend proxy 2026-04-14 22:48:00 -06:00
Alex
7baa780c7f added staff and customer images to desktop 2026-04-14 22:43:24 -06:00
Alex
2b4fcfe24c maade it so sales display points earned 2026-04-14 22:33:10 -06:00
Alex
b7d6adc1cc implemented forget password for desktop 2026-04-14 22:15:15 -06:00
Alex
01cce24997 fixed chat loading issue andriod 2026-04-14 22:08:14 -06:00