78aac62138
Fix staff analytics
2026-03-29 23:50:31 -06:00
d2a6332633
Show staff analytics
2026-03-29 23:34:52 -06:00
9c7f931df2
Scope staff analytics
2026-03-29 23:34:43 -06:00
7720fb6c34
Merge remote-tracking branch 'origin/FixedUIConsistancy'
2026-03-29 23:22:43 -06:00
4a68c99c4c
Merge pull request #56 from RecentRunner/expand-pets-products-data
...
Expand catalog
2026-03-29 23:08:37 -06:00
b18599c280
Tighten seed filters
2026-03-29 23:07:16 -06:00
d5fdee10d5
Add pet product filters
2026-03-29 22:54:25 -06:00
01550bac30
Expand pet product data
2026-03-29 22:54:16 -06:00
5bd836719b
Merge pull request #55 from RecentRunner/backend-normalize-users-payments
...
Normalize users
2026-03-29 22:40:13 -06:00
2cacf1f852
Clean up customer accounts
2026-03-29 22:37:18 -06:00
896f500552
Preserve backfill emails
2026-03-29 22:14:53 -06:00
b5efed880d
Disable generated user accounts
2026-03-29 22:09:39 -06:00
edbaabb42b
Tighten backfill migration
2026-03-29 22:02:44 -06:00
14ca0d8809
Tighten user linking
2026-03-29 21:59:43 -06:00
909026143d
Fix user linking
2026-03-29 21:52:45 -06:00
Alex
67f77f4b19
added pet images to petfragment and changed other views to look consistant
2026-03-29 21:47:49 -06:00
0c173060a8
Remove debit payment data
2026-03-29 21:44:10 -06:00
d8622df318
Backfill user accounts
2026-03-29 21:44:06 -06:00
f944124972
Merge pull request #54 from RecentRunner/backend-fixes-41-49
...
Fix backend appointments and chat
2026-03-29 21:24:36 -06:00
5d490d7d05
Remove chat close wrapper
2026-03-29 21:14:53 -06:00
72b423c8ad
Add appointment tests
2026-03-29 21:07:14 -06:00
36ac309442
Update chat conversation status
2026-03-29 21:07:10 -06:00
3b84eff536
Fix appointment overlap rules
2026-03-29 19:02:19 -06:00
ab97a86977
Add chat close endpoint
2026-03-29 19:02:12 -06:00
c37a2fdf45
Merge pull request #53 from RecentRunner/nomorebreaking
...
Merging in Nikitha's work
2026-03-29 18:21:56 -06:00
c397bfcad1
Fix status bar and navigation bar layout
2026-03-29 18:20:10 -06:00
d66508137b
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
4dd57e3484
Merge branch 'web-index'
2026-03-29 17:47:33 -06:00
augmentedpotato
c048c4bdc3
Account login
2026-03-29 17:43:31 -06:00
55caf434d6
Merge main into nomorebreaking
2026-03-29 17:07:35 -06:00
fdf438f3dd
Merge pull request #52 from RecentRunner/desktop-pet-product-pictures
...
Add desktop pet and product images
2026-03-29 16:58:06 -06:00
Nikitha
324e5d4e17
sales files
...
basic sale view and builtfiles
2026-03-29 16:54:41 -06:00
93e71434df
fix desktop pet and product dialogs
2026-03-29 16:54:01 -06:00
Nikitha
c4775bcbfa
Backend a small change
...
small change in appointment service to validate time for appointments.
2026-03-29 16:35:18 -06:00
Nikitha
862ece691a
purchaseorder view
...
Purchase Order view only so changes only to view
2026-03-29 16:33:27 -06:00
Nikitha
13916236eb
connected files
...
files connected to load
2026-03-29 16:32:25 -06:00
Nikitha
2ad097413b
Product files
...
loads details of product, categories and cost of it
2026-03-29 16:29:40 -06:00
Nikitha
653ae3f233
ProductSupplier
...
prodcutSupllier -loads all product supplier details and with cost details
2026-03-29 16:28:19 -06:00
Nikitha
87a4404c20
Inventory
...
Inventory- details of product loads with id and described with filter, and categories selection
2026-03-29 16:26:21 -06:00
Nikitha
55f40572de
Adoption files
...
adoption
2026-03-29 16:24:14 -06:00
Nikitha
7e832a139f
Appointments
...
validation, time slots for booking appointment , date, store. connected to service Type, pet name, customer name. Loads from database
2026-03-29 16:20:38 -06:00
8c6a53250a
add desktop pet and product images
2026-03-27 10:07:37 -06:00
Alex
8272c49b44
Changed android app icon
2026-03-26 22:45:28 -06:00
Alex
38e1a29f34
Added petprofile images and uploads in petprofilefragment
2026-03-26 22:07:51 -06:00
Alex
5d8d37dee4
Merge branch 'MorePushNotification'
2026-03-26 21:39:38 -06:00
Alex
2c61e6e664
Make chat notification display messengers name and disable notifying if already in chat view
2026-03-26 21:31:36 -06:00
2fb409f0d9
add pet and product images
2026-03-26 20:36:04 -06:00
Alex
dbb24085b2
Added push notifications when reciving any message and added filter status on pets in Andriod
2026-03-26 20:13:27 -06:00
Alex
75c39312fe
Added profile photo loading and uploading
...
- profile photos now load from backend
- profile photos can be uploaded to the backend
- RetrofitClient now automatically determines if the device is an emulator or hardware so we dont have to comment and uncomment everytime we test with a different device
2026-03-26 16:50:02 -06:00
Alex
aec9f7b9e0
Added role based access to android login
...
- Admin has access to everything
- Staff has limited access to what they can edit in listfragment
- Customers cannot login to app
- added validations to pets, supplier and services in their detailed view
2026-03-26 16:50:02 -06:00
