Commit Graph

712 Commits

Author SHA1 Message Date
augmentedpotato
2c1871b6e2 loyalty points 2026-04-15 01:34:49 -06:00
augmentedpotato
1636ba14b6 Coupon system working properly 2026-04-15 00:54:46 -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
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
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
9cc2da6b92 merge main 2026-04-14 23:29:46 -06:00
Alex
08c8e54b2d Merge branch 'AttachmentsToChat' 2026-04-14 23:20:16 -06:00
3ee259abfd lazy init 2026-04-14 23:19:34 -06:00
Alex
42a4bcd104 made admin analyics able to select store 2026-04-14 23:17:12 -06:00
Alex
ec0d2d1ec7 added personal and store analytics 2026-04-14 23:10:03 -06:00
6aac0c6366 Merge remote-tracking branch 'origin/main' into azure-deploy 2026-04-14 23:06:48 -06:00
1a51f16ee0 show error details 2026-04-14 22:56:54 -06:00
Alex
7340a5616e Changed android phone validation 2026-04-14 22:53:42 -06:00
dea1caafd6 runtime backend proxy 2026-04-14 22:52:01 -06:00
d35c820967 use middleware for runtime backend proxy 2026-04-14 22:48:00 -06:00
Alex
9c47f5ac76 added staff and customer images to desktop 2026-04-14 22:43:24 -06:00
Alex
aca52efc44 maade it so sales display points earned 2026-04-14 22:33:10 -06:00
Alex
6848ab3586 implemented forget password for desktop 2026-04-14 22:15:15 -06:00
Alex
b3547b2971 fixed chat loading issue andriod 2026-04-14 22:08:14 -06:00
5b88ee242e fix lowercase image name in workflow 2026-04-14 21:37:16 -06:00
06a6eeff9c trigger CI on azure-deploy branch 2026-04-14 21:35:36 -06:00
9cafc305fd Azure deployment setup 2026-04-14 21:29:00 -06:00
Alex
6382c87d67 Merge branch 'AttachmentsToChat' 2026-04-14 21:15:19 -06:00
Alex
44b7fcbba2 added forget password 2026-04-14 21:13:57 -06:00
77d106cb06 Merge pull request #296 from RecentRunner/easy-fixes
Logs folder and activity log defaults
2026-04-14 20:50:14 -06:00
f8cf68eb1a Logs folder and activity log date default 2026-04-14 20:50:03 -06:00
67d3cb2c7f Merge pull request #280 from RecentRunner/chat-fixes
Fix chat attachments and avatars
2026-04-14 20:26:03 -06:00
8127b539e8 Fix chat attachments and avatars 2026-04-14 20:25:54 -06:00
ea1237942d Merge pull request #278 from RecentRunner/desktop-backend-fixes
Activity log, staff role, chat
2026-04-14 20:17:21 -06:00
9d6d7d885d Activity log filters, staff role, chat fix 2026-04-14 20:17:03 -06:00
86061e2733 Merge pull request #275 from RecentRunner/backend-fixes
Backend bug fixes
2026-04-14 20:03:32 -06:00
923d323808 Block chat injection 2026-04-14 20:03:11 -06:00
933bd6b7fd Add species filtering 2026-04-14 20:03:11 -06:00
0c63963ddf Drop status column 2026-04-14 20:03:11 -06:00
51a48e07eb Fix stuck pet status 2026-04-14 20:03:11 -06:00
3a7621678d Fix backend issues 2026-04-14 20:03:11 -06:00
0a8b96bc3b Merge pull request #274 from RecentRunner/desktop-notifications
desktop chat notifications
2026-04-14 19:59:57 -06:00
d3e203b575 add desktop chat notifications 2026-04-14 19:59:42 -06:00
02768f940a fix backend issues 2026-04-14 19:59:39 -06:00
711c018014 Merge pull request #268 from RecentRunner/fix/admin-account-guard
Harden admin guards
2026-04-14 16:10:10 -06:00
758b44d6d6 Harden admin guards 2026-04-14 16:09:39 -06:00