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

• 3c4743fa70 fix image paths Harkamal Randhawa 2026-04-14 00:11:07 -06:00
• 599104677d fix image paths Harkamal Randhawa 2026-04-14 00:11:07 -06:00
• 168ebe94fc add cart points fields Harkamal Randhawa 2026-04-14 00:11:02 -06:00
• f4b62bc8c4 add cart points fields Harkamal Randhawa 2026-04-14 00:11:02 -06:00
• 94344b146f Merge branch 'AttachmentsToChat' Alex 2026-04-13 22:36:53 -06:00
• 6fb7ac7817 Merge branch 'AttachmentsToChat' Alex 2026-04-13 22:36:53 -06:00
• d898732a17 seperated staff and customer on desktop Alex 2026-04-13 22:15:41 -06:00
• 3b07eeaee2 seperated staff and customer on desktop Alex 2026-04-13 22:15:41 -06:00
• 2757bc66da Merge pull request #253 from RecentRunner/images Harkamal 2026-04-13 21:58:01 -06:00
• adc8c477c2 Merge pull request #253 from RecentRunner/images Harkamal 2026-04-13 21:58:01 -06:00
• b115a4b66c localize seed image URLs to upload paths Harkamal Randhawa 2026-04-13 21:57:29 -06:00
• f7480f5e80 localize seed image URLs to upload paths Harkamal Randhawa 2026-04-13 21:57:29 -06:00
• c38bb24e94 fixed phone validation desktop Alex 2026-04-13 21:52:53 -06:00
• 52624118f6 fixed phone validation desktop Alex 2026-04-13 21:52:53 -06:00
• 98584f1324 added dropdowns for breed desktop Alex 2026-04-13 21:40:34 -06:00
• 819109893c added dropdowns for breed desktop Alex 2026-04-13 21:40:34 -06:00
• 3ef6604884 fixed pet busniss logic desktop Alex 2026-04-13 21:10:35 -06:00
• 954154e99c fixed pet busniss logic desktop Alex 2026-04-13 21:10:35 -06:00
• 044e9ba7b2 made it so staff cannot change the status of pets for desktop for adopted or owned Alex 2026-04-13 20:49:22 -06:00
• 83507f4207 made it so staff cannot change the status of pets for desktop for adopted or owned Alex 2026-04-13 20:49:22 -06:00
• f93f4f576b Merge pull request #252 from RecentRunner/merge-migration Harkamal 2026-04-13 19:48:37 -06:00
• a04cdd60d6 Merge pull request #252 from RecentRunner/merge-migration Harkamal 2026-04-13 19:48:37 -06:00
• 1b00366a1e make ActivityLog entity immutable Harkamal Randhawa 2026-04-13 19:47:45 -06:00
• e0297dff6a make ActivityLog entity immutable Harkamal Randhawa 2026-04-13 19:47:45 -06:00
• 572895efa9 added correct refund logic and points for sales Alex 2026-04-13 19:46:52 -06:00
• 0f65d6c242 added correct refund logic and points for sales Alex 2026-04-13 19:46:52 -06:00
• c244e5742a added points to sale and logic backend Alex 2026-04-13 19:46:28 -06:00
• f13bb90aa0 added points to sale and logic backend Alex 2026-04-13 19:46:28 -06:00
• 6efa440bbc added loyaltypoint usage to sales unfinished still needs to work with the backend Alex 2026-04-13 18:52:07 -06:00
• 9dad410c54 added loyaltypoint usage to sales unfinished still needs to work with the backend Alex 2026-04-13 18:52:07 -06:00
• 0e53b16d6c seed normalization Harkamal Randhawa 2026-04-13 18:29:49 -06:00
• 1b1236bfb2 seed normalization Harkamal Randhawa 2026-04-13 18:29:49 -06:00
• 884f56c9a7 Can now edit loyalty points for customer on andriod, and pets now have breed dropdown Alex 2026-04-13 18:25:11 -06:00
• 40955b616b Can now edit loyalty points for customer on andriod, and pets now have breed dropdown Alex 2026-04-13 18:25:11 -06:00
• 0e997071c3 Merge pull request #251 from RecentRunner/payment-fixes Harkamal 2026-04-13 17:52:21 -06:00
• af5e3a88ea Merge pull request #251 from RecentRunner/payment-fixes Harkamal 2026-04-13 17:52:21 -06:00
• 68893b1318 Unique sale constraint Harkamal Randhawa 2026-04-13 17:48:10 -06:00
• b64b426406 Unique sale constraint Harkamal Randhawa 2026-04-13 17:48:10 -06:00
• a221f2a91b Add payment features Harkamal Randhawa 2026-04-13 17:46:03 -06:00
• a5a1757af7 Add payment features Harkamal Randhawa 2026-04-13 17:46:03 -06:00
• 1577ed41cd Add checkout snapshot Harkamal Randhawa 2026-04-13 17:36:16 -06:00
• 141ca34ea0 Add checkout snapshot Harkamal Randhawa 2026-04-13 17:36:16 -06:00
• 1b4069e7e4 made sales readonly for andriod Alex 2026-04-13 17:25:28 -06:00
• 53a11449ac made sales readonly for andriod Alex 2026-04-13 17:25:28 -06:00
• a6f90f8477 Fixed phone validation for andriod Alex 2026-04-13 17:18:46 -06:00
• cba39e8a3c Fixed phone validation for andriod Alex 2026-04-13 17:18:46 -06:00
• aefa00f95d added pending status on pets andiord, also made pets automatically switch to pending when an adoption is in pending Alex 2026-04-13 17:12:41 -06:00
• 688a04c3bc added pending status on pets andiord, also made pets automatically switch to pending when an adoption is in pending Alex 2026-04-13 17:12:41 -06:00
• c145b3e552 Merge branch 'AttachmentsToChat' Alex 2026-04-13 15:07:28 -06:00
• 9fdb3087da Merge branch 'AttachmentsToChat' Alex 2026-04-13 15:07:28 -06:00
• c5de2fdd87 added store column to desktop and display only logged in data Alex 2026-04-13 15:06:04 -06:00
• facf1d588b added store column to desktop and display only logged in data Alex 2026-04-13 15:06:04 -06:00
• ef3318a4ff Merge pull request #172 from RecentRunner/web-adopt-filter Harkamal 2026-04-13 11:08:41 -06:00
• 3000a64be3 Merge pull request #172 from RecentRunner/web-adopt-filter Harkamal 2026-04-13 11:08:41 -06:00
• 39e30aa8d5 Remove XML declaration from misc.xml Harkamal Randhawa 2026-04-13 11:06:59 -06:00
• de58b0b131 Remove XML declaration from misc.xml Harkamal Randhawa 2026-04-13 11:06:59 -06:00
• de5bbbf3f7 Adopt page filter added augmentedpotato 2026-04-12 13:44:48 -06:00
• 23125418c3 Adopt page filter added augmentedpotato 2026-04-12 13:44:48 -06:00
• fba042d2b9 fixed rotated image for pets and product as well Alex 2026-04-13 00:30:26 -06:00
• d9c34abcf8 fixed rotated image for pets and product as well Alex 2026-04-13 00:30:26 -06:00
• d85530dd2c Fix profile image squish and rotate isusse Alex 2026-04-13 00:07:58 -06:00
• 296f99900a Fix profile image squish and rotate isusse Alex 2026-04-13 00:07:58 -06:00
• 326182aeef added coupons to desktop app Alex 2026-04-12 23:47:22 -06:00
• 227eb9cac8 added coupons to desktop app Alex 2026-04-12 23:47:22 -06:00
• 2172bede74 desktop: added confirmation to change onwer and only admins can change this Alex 2026-04-12 20:01:06 -06:00
• 1f801d7486 desktop: added confirmation to change onwer and only admins can change this Alex 2026-04-12 20:01:06 -06:00
• f497251873 added closed chat section and fixed closed chat bug for desktop Alex 2026-04-12 19:49:12 -06:00
• 5f7f40f98a added closed chat section and fixed closed chat bug for desktop Alex 2026-04-12 19:49:12 -06:00
• e4e04940a9 Fixed minor bugs Alex 2026-04-12 18:34:43 -06:00
• d870475bc9 Fixed minor bugs Alex 2026-04-12 18:34:43 -06:00
• b493357f31 adjusted so only available pets for the selected store is displayed when adopting Alex 2026-04-12 18:00:24 -06:00
• 077780c0c3 adjusted so only available pets for the selected store is displayed when adopting Alex 2026-04-12 18:00:24 -06:00
• 4eaf98834d Modified project to use our utils on areas we arnt to manage code Alex 2026-04-12 17:49:24 -06:00
• 42c9e96500 Modified project to use our utils on areas we arnt to manage code Alex 2026-04-12 17:49:24 -06:00
• 7cdab36f5d Fixed Log filters and fixed chat attachment download Alex 2026-04-12 17:28:40 -06:00
• e6e8dc1b23 Fixed Log filters and fixed chat attachment download Alex 2026-04-12 17:28:40 -06:00
• 6831123aed added Activitylogs andriod Alex 2026-04-12 16:58:12 -06:00
• 7a4c711e7f added Activitylogs andriod Alex 2026-04-12 16:58:12 -06:00
• f7b8648778 Merge branch 'AttachmentsToChat' Alex 2026-04-12 01:09:25 -06:00
• 0e9bbcbcea Merge branch 'AttachmentsToChat' Alex 2026-04-12 01:09:25 -06:00
• 870fa5488a added Forgetpassword page with no logic yet Alex 2026-04-12 01:08:25 -06:00
• 30f14a5152 added Forgetpassword page with no logic yet Alex 2026-04-12 01:08:25 -06:00
• 3472b4bcd7 Faded text for disabled spinners in staff Alex 2026-04-12 00:51:49 -06:00
• a6d1c089ac Faded text for disabled spinners in staff Alex 2026-04-12 00:51:49 -06:00
• d166ec1b4d staff cant change status or store for pets Alex 2026-04-12 00:49:15 -06:00
• 0df8212a65 staff cant change status or store for pets Alex 2026-04-12 00:49:15 -06:00
• f023077715 Made it so only admins can change pet owners Alex 2026-04-12 00:37:15 -06:00
• 16c832bd14 Made it so only admins can change pet owners Alex 2026-04-12 00:37:15 -06:00
• 96e6cd6dc7 Fixed Coupon to use in sales Alex 2026-04-12 00:25:33 -06:00
• 57e5b06666 Fixed Coupon to use in sales Alex 2026-04-12 00:25:33 -06:00
• 0311887185 Used the wrong endpoint for populating species, changed to to the correct one Alex 2026-04-11 23:50:22 -06:00
• 54139e9e13 Used the wrong endpoint for populating species, changed to to the correct one Alex 2026-04-11 23:50:22 -06:00
• 27b15893a7 Merge pull request #171 from RecentRunner/admin-activity-logs Harkamal 2026-04-11 23:32:38 -06:00
• 7f7b9d2ed7 Merge pull request #171 from RecentRunner/admin-activity-logs Harkamal 2026-04-11 23:32:38 -06:00
• 9b59c5bfe0 restrict activity logging to admin and staff only Harkamal Randhawa 2026-04-11 23:29:23 -06:00
• a3e1f67779 restrict activity logging to admin and staff only Harkamal Randhawa 2026-04-11 23:29:23 -06:00
• 62094f2f4f Harden startup config Harkamal Randhawa 2026-04-11 23:10:18 -06:00
• 79b4f7a3e8 Harden startup config Harkamal Randhawa 2026-04-11 23:10:18 -06:00
• 8ae47ef056 added petspecies spinner Alex 2026-04-11 23:04:14 -06:00
• 2075d0ba17 added petspecies spinner Alex 2026-04-11 23:04:14 -06:00