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
d3723b8ae5
Merge main into nomorebreaking
2026-03-29 17:07:35 -06:00
a254d88775
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
b3a30e10d1
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
8a278cd6e2
add desktop pet and product images
2026-03-27 10:07:37 -06:00
Alex
f5e031484e
Changed android app icon
2026-03-26 22:45:28 -06:00
Alex
1360fa1592
Added petprofile images and uploads in petprofilefragment
2026-03-26 22:07:51 -06:00
Alex
998390c063
Merge branch 'MorePushNotification'
2026-03-26 21:39:38 -06:00
Alex
9f38ca1bcc
Make chat notification display messengers name and disable notifying if already in chat view
2026-03-26 21:31:36 -06:00
a3ad1dab8c
add pet and product images
2026-03-26 20:36:04 -06:00
Alex
177ac844ee
Added push notifications when reciving any message and added filter status on pets in Andriod
2026-03-26 20:13:27 -06:00
Alex
4f02825b96
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
d31db865cf
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
5c94880733
use swing picker on wayland
2026-03-25 23:55:40 -06:00
3c9a3bf1b3
readd secure avatar endpoints
2026-03-25 22:58:04 -06:00
46d7b58238
Merge pull request #30 from RecentRunner/WorkingOnProfileAndPushNotification
...
Working on profile and push notification
2026-03-25 09:18:48 -06:00
Alex
d3a69b7aea
added push notification when a new conversation is made
2026-03-24 22:41:54 -06:00
29153cb6ee
Merge pull request #29 from RecentRunner/desktop---validator-fixes
...
added null checks to validator, created a bunch of junit tests
2026-03-24 20:43:54 -06:00
augmentedpotato
4736b8bd3f
added null checks to validator, created a bunch of junit tests
2026-03-24 20:42:45 -06:00
Alex
b46705396d
Profile now loads from backend
...
- can update profile from app
- loads profile details from backend to display
- changed inputValidator to use andriod phone pattern
- added ErrorResponse so we can fetch error messages from the backend
- Added UserDTO to get profile info
TODO:
Still need to get profile images from the backend and beable to load and update them using the backend
2026-03-24 18:31:12 -06:00
5b7c19f334
Merge pull request #28 from RecentRunner/web-index
...
uploading index to repo
2026-03-24 16:59:39 -06:00
augmentedpotato
a7dfe3962d
uploading index to repo
2026-03-24 16:56:03 -06:00
79f8514f3e
Tighten reset cleanup
2026-03-18 20:28:55 -06:00
bbc7fa3aa8
Clean backend reset flow
2026-03-18 20:21:55 -06:00
2b616b8306
Remove Android VCS mapping
2026-03-18 19:46:15 -06:00
7e39925bcb
Share IDE project settings
2026-03-18 19:40:43 -06:00
85839cbc4f
Add empty web folder
2026-03-18 19:23:31 -06:00
66395139e0
Add 'android/' from commit '4e3261e9879f36679271f2dbdf6023ad01334265'
...
git-subtree-dir: android
git-subtree-mainline: 58b37b52384ca0a702c23297a2cd9bdad595c660
git-subtree-split: 4e3261e987
2026-03-18 19:23:20 -06:00
29c4afcfec
Add 'desktop/' from commit 'bc9a54b29a8a8c8272609082438f36b92de7f4d1'
...
git-subtree-dir: desktop
git-subtree-mainline: 737028e06d5207fc69425cf4431b7d047cf3110f
git-subtree-split: bc9a54b29a
2026-03-18 19:23:20 -06:00
d0c06226f7
Add 'backend/' from commit '51bf07d5e16469036a8363e6b9d53616cbed643f'
...
git-subtree-dir: backend
git-subtree-mainline: 6dc2b48035ed90480e499efdb4513dff7b566616
git-subtree-split: 51bf07d5e1
2026-03-18 19:23:20 -06:00
1d7aa5ee42
Initial commit
2026-03-18 18:14:39 -06:00
