Commit Graph

Select branches

Hide Pull Requests

local-dev

main

#108

#133

#134

#135

#138

#139

#141

#142

#143

#144

#145

#146

#152

#154

#155

#156

#158

#160

#161

#162

#163

#164

#168

#169

#170

#171

#172

#251

#252

#253

#254

#266

#267

#268

#274

#275

#278

#28

#280

#29

#296

#297

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#320

#322

#324

#325

#326

#335

#336

#337

#338

#47

#48

#50

#52

#53

#54

#55

#56

#57

#58

#59

#60

#75

Mono Color

• 811edf842b converted new fragments to use hilt, MVVM and jetpack nav Alex 2026-04-08 02:22:34 -06:00
• 4ad94a318f converted new fragments to use hilt, MVVM and jetpack nav Alex 2026-04-08 02:22:34 -06:00
• a35b432b54 Converted merged fragments to viewbinding Alex 2026-04-08 02:06:07 -06:00
• f908169bcf Converted merged fragments to viewbinding Alex 2026-04-08 02:06:07 -06:00
• 627ce7a987 Added hamburger menu helperfunction Alex 2026-04-08 01:50:18 -06:00
• 30ae416ba4 Added hamburger menu helperfunction Alex 2026-04-08 01:50:18 -06:00
• 57ac8ad2ce added filtering for Sales and added helper method for setting up filtertoggle andriod Alex 2026-04-08 01:32:34 -06:00
• 3e01ad07cd added filtering for Sales and added helper method for setting up filtertoggle andriod Alex 2026-04-08 01:32:34 -06:00
• 526650bd98 fix minor bugs and UI inconsistancy Alex 2026-04-08 00:22:25 -06:00
• 4fc33fedf4 fix minor bugs and UI inconsistancy Alex 2026-04-08 00:22:25 -06:00
• 21d086a816 Can now add pets in the appointments page. augmentedpotato 2026-04-07 23:53:48 -06:00
• 2469c07fef Can now add pets in the appointments page. augmentedpotato 2026-04-07 23:53:48 -06:00
• a6b188e0d6 Feature parity with admins and users (also a minor backend change) augmentedpotato 2026-04-07 23:23:05 -06:00
• 83477904be Feature parity with admins and users (also a minor backend change) augmentedpotato 2026-04-07 23:23:05 -06:00
• bd46968b90 Fixed(?) being unable to create appointments on today's date augmentedpotato 2026-04-07 22:44:50 -06:00
• ffef9243dd Fixed(?) being unable to create appointments on today's date augmentedpotato 2026-04-07 22:44:50 -06:00
• ef1b7ac716 fix image error responses Harkamal Randhawa 2026-04-07 22:41:32 -06:00
• 26f9f8c0d8 fix image error responses Harkamal Randhawa 2026-04-07 22:41:32 -06:00
• b3ff789f1b revert adoption fragment Harkamal Randhawa 2026-04-07 22:17:15 -06:00
• d1e77f8ef3 revert adoption fragment Harkamal Randhawa 2026-04-07 22:17:15 -06:00
• 3baef0e1ab Merge branch 'morefiles' Harkamal Randhawa 2026-04-07 21:43:20 -06:00
• f54bc906f1 Merge branch 'morefiles' Harkamal Randhawa 2026-04-07 21:43:20 -06:00
• 65140d77ac finish android merge wiring Harkamal Randhawa 2026-04-07 21:15:31 -06:00
• 888591c970 finish android merge wiring Harkamal Randhawa 2026-04-07 21:15:31 -06:00
• 1de6c981dc fix backend merge conflicts Harkamal Randhawa 2026-04-07 21:13:47 -06:00
• 60f344d207 fix backend merge conflicts Harkamal Randhawa 2026-04-07 21:13:47 -06:00
• 9ca647f0cc merge origin/main into morefiles, resolve all conflicts Harkamal Randhawa 2026-04-07 20:29:54 -06:00
• 507314b7e3 merge origin/main into morefiles, resolve all conflicts Harkamal Randhawa 2026-04-07 20:29:54 -06:00
• 332f38db57 added filter by date for adoptions to backend Alex 2026-04-07 18:34:08 -06:00
• 6eddcc49ec added filter by date for adoptions to backend Alex 2026-04-07 18:34:08 -06:00
• 54ab737e2d added helper method for filter spinners to maintain code Alex 2026-04-07 18:12:02 -06:00
• 9498128ab1 added helper method for filter spinners to maintain code Alex 2026-04-07 18:12:02 -06:00
• 155c64a729 added adoption search and filter andriod and backend Alex 2026-04-07 18:06:07 -06:00
• 492591752d added adoption search and filter andriod and backend Alex 2026-04-07 18:06:07 -06:00
• 538b4440d8 fixed purchase order for android on new backend Alex 2026-04-07 17:31:43 -06:00
• 31df67ef33 fixed purchase order for android on new backend Alex 2026-04-07 17:31:43 -06:00
• 5a3229eb19 Merge branch 'main' into AttachmentsToChat Alex 2026-04-07 16:24:17 -06:00
• ce5adccdfe Merge branch 'main' into AttachmentsToChat Alex 2026-04-07 16:24:17 -06:00
• c232f193d1 added bulk delete for ProductSupplier, appointments, and adoptions Alex 2026-04-07 16:20:51 -06:00
• 01f5efa991 added bulk delete for ProductSupplier, appointments, and adoptions Alex 2026-04-07 16:20:51 -06:00
• f17ad44155 fix alias folder ordering and request bodies in Postman collection Harkamal Randhawa 2026-04-07 16:16:11 -06:00
• fa4529e123 fix alias folder ordering and request bodies in Postman collection Harkamal Randhawa 2026-04-07 16:16:11 -06:00
• 4500b213c6 fix audit report mismatches across backend and android Harkamal Randhawa 2026-04-07 16:06:44 -06:00
• 2f369c0b17 fix audit report mismatches across backend and android Harkamal Randhawa 2026-04-07 16:06:44 -06:00
• 4ccfe55174 bluk delete added for Service and suppliers on andriod Alex 2026-04-07 15:24:25 -06:00
• 713e919c10 bluk delete added for Service and suppliers on andriod Alex 2026-04-07 15:24:25 -06:00
• 0173123898 update postman collection Harkamal Randhawa 2026-04-07 15:19:25 -06:00
• b423912a9a update postman collection Harkamal Randhawa 2026-04-07 15:19:25 -06:00
• 9eaf64c7a9 added helper class for bulk delete and mad pets have bulk delete Alex 2026-04-07 15:13:15 -06:00
• 93b4ad8c50 added helper class for bulk delete and mad pets have bulk delete Alex 2026-04-07 15:13:15 -06:00
• aa30efd3b6 Did the same to inventory Alex 2026-04-07 14:55:43 -06:00
• 0813bb4b44 Did the same to inventory Alex 2026-04-07 14:55:43 -06:00
• 852a8a0eb2 update web packages Harkamal Randhawa 2026-04-07 14:36:20 -06:00
• ada9f7fcf9 update web packages Harkamal Randhawa 2026-04-07 14:36:20 -06:00
• 4e887c1a73 updard Adoptions in andriod for new backend Alex 2026-04-07 14:35:57 -06:00
• 679c451c04 updard Adoptions in andriod for new backend Alex 2026-04-07 14:35:57 -06:00
• 108de589bc edited adapters in andriod to use viewbinding Alex 2026-04-07 14:17:24 -06:00
• baa143ff00 edited adapters in andriod to use viewbinding Alex 2026-04-07 14:17:24 -06:00
• 27871d96f5 stabilize desktop chat Harkamal Randhawa 2026-04-07 09:38:17 -06:00
• 89c706b893 stabilize desktop chat Harkamal Randhawa 2026-04-07 09:38:17 -06:00
• c776c579ab fix desktop chat Harkamal Randhawa 2026-04-07 09:34:31 -06:00
• 7980a7b930 fix desktop chat Harkamal Randhawa 2026-04-07 09:34:31 -06:00
• 9096f4fd29 fix desktop user inventory crud Harkamal Randhawa 2026-04-07 09:31:26 -06:00
• 3d0e7011c1 fix desktop user inventory crud Harkamal Randhawa 2026-04-07 09:31:26 -06:00
• 858d13cadc fix desktop adoption save Harkamal Randhawa 2026-04-07 09:27:34 -06:00
• f0025886e9 fix desktop adoption save Harkamal Randhawa 2026-04-07 09:27:34 -06:00
• 4d7f452a97 add my pets api Harkamal Randhawa 2026-04-07 09:15:01 -06:00
• 0cb2ecff02 add my pets api Harkamal Randhawa 2026-04-07 09:15:01 -06:00
• ee2cab953d fix web registration Harkamal Randhawa 2026-04-07 09:10:11 -06:00
• 4d244cc1c5 fix web registration Harkamal Randhawa 2026-04-07 09:10:11 -06:00
• 0655dfdfea fix desktop appointments Harkamal Randhawa 2026-04-07 09:05:08 -06:00
• d3563e1f75 fix desktop appointments Harkamal Randhawa 2026-04-07 09:05:08 -06:00
• c61f71d226 loading employee in appointments and adoptions Nikitha 2026-04-07 08:43:49 -06:00
• d3b9d28513 loading employee in appointments and adoptions Nikitha 2026-04-07 08:43:49 -06:00
• de654e487b Merge pull request #146 from RecentRunner/AttachmentsToChat Harkamal 2026-04-07 08:23:47 -06:00
• dee517593c Merge pull request #146 from RecentRunner/AttachmentsToChat Harkamal 2026-04-07 08:23:47 -06:00
• 6d77a98d92 merge main Harkamal Randhawa 2026-04-07 08:23:23 -06:00
• e497abb09d merge main Harkamal Randhawa 2026-04-07 08:23:23 -06:00
• 7e3d094217 update postman collection Harkamal Randhawa 2026-04-07 07:19:00 -06:00
• 98a589ec33 update postman collection Harkamal Randhawa 2026-04-07 07:19:00 -06:00
• 7c0ab0bfae added an api connection to Users in Andriod Alex 2026-04-07 07:46:22 -06:00
• 8261cdfc2d added an api connection to Users in Andriod Alex 2026-04-07 07:46:22 -06:00
• 8c5348dbb6 fixed creating adoption for the backend and implemented adoption to andriod for changes Alex 2026-04-07 07:27:37 -06:00
• b4c1175ee1 fixed creating adoption for the backend and implemented adoption to andriod for changes Alex 2026-04-07 07:27:37 -06:00
• 3c35e05e47 Merge pull request #145 from RecentRunner/AttachmentsToChat Harkamal 2026-04-07 06:53:07 -06:00
• 0f0a72455b Merge pull request #145 from RecentRunner/AttachmentsToChat Harkamal 2026-04-07 06:53:07 -06:00
• 77e93a38b7 added my appointments button for logged in user on andriod Alex 2026-04-07 06:48:36 -06:00
• 0a55014f21 added my appointments button for logged in user on andriod Alex 2026-04-07 06:48:36 -06:00
• 6f646a7cf0 added filter options to appointments in the backend and andriod Alex 2026-04-07 06:34:28 -06:00
• 094c2d4a48 added filter options to appointments in the backend and andriod Alex 2026-04-07 06:34:28 -06:00
• b7f97c45a5 updated Appointments on andriod for new backend Alex 2026-04-07 06:14:17 -06:00
• 9bab45f04b updated Appointments on andriod for new backend Alex 2026-04-07 06:14:17 -06:00
• 5c9d04fc88 changed backend so can sortBy productName and added search to productSupplier Alex 2026-04-07 05:48:24 -06:00
• 195c4605f0 changed backend so can sortBy productName and added search to productSupplier Alex 2026-04-07 05:48:24 -06:00
• cbd038d8fb Added filter by store for inventory in back end and added search to inventory Alex 2026-04-07 05:24:25 -06:00
• 1990022c1e Added filter by store for inventory in back end and added search to inventory Alex 2026-04-07 05:24:25 -06:00
• 6c832e01f3 updated inventory backend to have filter by store and added more search features to andriod Alex 2026-04-07 05:09:48 -06:00
• ef5651d468 updated inventory backend to have filter by store and added more search features to andriod Alex 2026-04-07 05:09:48 -06:00
• 1d00a3b55c updated search to call api for supplier Alex 2026-04-07 04:19:51 -06:00
• 863a85472f updated search to call api for supplier Alex 2026-04-07 04:19:51 -06:00