Commit Graph

398 Commits

Author SHA1 Message Date
3d6b87a7d2 Automate reset cleanup 2026-04-01 20:17:30 -06:00
5ef045165d Remove duplicate migration 2026-04-01 20:08:39 -06:00
488f67289d Integrate refund logic 2026-04-01 19:59:03 -06:00
38a71a8b59 Merge pull request #75 from RecentRunner/fix-features-icons-v2
Finalize feature fixes
2026-04-01 19:31:28 -06:00
054094a61e Add desktop icons 2026-04-01 18:10:20 -06:00
c48039eeb4 Fix phone formatting 2026-04-01 18:08:37 -06:00
e580ed3251 Apply service logic 2026-04-01 16:57:27 -06:00
695c80ba9d Merge migration fixes 2026-04-01 16:55:36 -06:00
bdbcd75042 Revert "Merge pull request #55 from RecentRunner/backend-normalize-users-payments"
This reverts commit aa0950df9b, reversing
changes made to fdd4af6746.
2026-03-30 09:58:02 -06:00
563f8ee691 Fix migration versions 2026-03-30 09:57:46 -06:00
352d7beec1 Merge pull request #60 from RecentRunner/web-products
Web products
2026-03-30 09:51:34 -06:00
d078af520d Merge remote-tracking branch 'origin/main' into web-products 2026-03-30 09:50:57 -06:00
77c5f53532 Merge pull request #59 from RecentRunner/web-index
Web index
2026-03-30 09:48:50 -06:00
06908ffacb Merge pull request #58 from RecentRunner/refund-layout-spacing
Refund polish
2026-03-30 09:41:16 -06:00
9c3f5d4d50 Fix refund display 2026-03-30 09:40:22 -06:00
31a11656c4 Stabilize refunds 2026-03-30 09:17:22 -06:00
07cd4f6c0e Polish sales tables 2026-03-30 09:16:52 -06:00
augmentedpotato
3b8b1e9b97 Appointments, account stuff, adopt a pet changes 2026-03-30 05:38:15 -06:00
8f05f22b23 Fix android backend url 2026-03-30 00:03:27 -06:00
467daa35f0 Merge pull request #57 from RecentRunner/staff-self-analytics
Staff analytics
2026-03-29 23:55:33 -06:00
0f20523b3c Fix staff analytics 2026-03-29 23:50:31 -06:00
a9fc3e3227 Show staff analytics 2026-03-29 23:34:52 -06:00
061275ba30 Scope staff analytics 2026-03-29 23:34:43 -06:00
edea9ef315 Merge remote-tracking branch 'origin/FixedUIConsistancy' 2026-03-29 23:22:43 -06:00
a7162682c4 Merge pull request #56 from RecentRunner/expand-pets-products-data
Expand catalog
2026-03-29 23:08:37 -06:00
5791ddc47d Tighten seed filters 2026-03-29 23:07:16 -06:00
e572d9f3cf Add pet product filters 2026-03-29 22:54:25 -06:00
c48e3b8a95 Expand pet product data 2026-03-29 22:54:16 -06:00
aa0950df9b Merge pull request #55 from RecentRunner/backend-normalize-users-payments
Normalize users
2026-03-29 22:40:13 -06:00
5d3efa0af5 Clean up customer accounts 2026-03-29 22:37:18 -06:00
3fbb108646 Preserve backfill emails 2026-03-29 22:14:53 -06:00
1a0fe7f95d Disable generated user accounts 2026-03-29 22:09:39 -06:00
f6147aa810 Tighten backfill migration 2026-03-29 22:02:44 -06:00
277d1dce8f Tighten user linking 2026-03-29 21:59:43 -06:00
24041f4242 Fix user linking 2026-03-29 21:52:45 -06:00
Alex
26c437261f added pet images to petfragment and changed other views to look consistant 2026-03-29 21:47:49 -06:00
1bab36f727 Remove debit payment data 2026-03-29 21:44:10 -06:00
a727878b0c Backfill user accounts 2026-03-29 21:44:06 -06:00
fdd4af6746 Merge pull request #54 from RecentRunner/backend-fixes-41-49
Fix backend appointments and chat
2026-03-29 21:24:36 -06:00
54b3b1d457 Remove chat close wrapper 2026-03-29 21:14:53 -06:00
9dba49e141 Add appointment tests 2026-03-29 21:07:14 -06:00
df42f68c04 Update chat conversation status 2026-03-29 21:07:10 -06:00
3cb3faa073 Fix appointment overlap rules 2026-03-29 19:02:19 -06:00
c5e9baad5e Add chat close endpoint 2026-03-29 19:02:12 -06:00
32ce987fbc Merge pull request #53 from RecentRunner/nomorebreaking
Merging in Nikitha's work
2026-03-29 18:21:56 -06:00
b8fa6b730f Fix status bar and navigation bar layout 2026-03-29 18:20:10 -06:00
8d419b0dd9 Fix Android app connection and timeout issues
Add proper timeout configuration to OkHttpClient (30s connect/read/write)
Update OkHttp logging-interceptor to 4.12.0 to match OkHttp version
Improve error messages to show server URL for debugging
Configure backend to listen on all interfaces (0.0.0.0)
Remove EdgeToEdge calls that interfered with layout
2026-03-29 17:54:23 -06:00
augmentedpotato
cce97b7509 Merge branch 'web-index' 2026-03-29 17:47:33 -06:00
augmentedpotato
c048c4bdc3 Account login 2026-03-29 17:43:31 -06:00
d3723b8ae5 Merge main into nomorebreaking 2026-03-29 17:07:35 -06:00