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

• 9ae6ddc48e Fix inventory and supplier API field names Harkamal Randhawa 2026-03-05 11:00:04 -07:00
• caec657d5b Fix product API field names to match Postman Harkamal Randhawa 2026-03-05 10:53:49 -07:00
• d7fb057e64 Match Postman API contract for desktop app Harkamal Randhawa 2026-03-05 08:44:49 -07:00
• bdfc592821 Add Postman collection and update JDK to 25 Harkamal Randhawa 2026-03-05 08:13:37 -07:00
• d6eaeb2d88 Restore complete implementations Harkamal Randhawa 2026-03-05 06:00:38 -07:00
• 7609a8e825 Fix annotation processing in Maven Harkamal Randhawa 2026-03-04 22:00:42 -07:00
• c5da0582fb Add IntelliJ run configurations Harkamal Randhawa 2026-03-04 21:52:20 -07:00
• 5b4797fdcc Add Docker support with auto database initialization Harkamal Randhawa 2026-03-04 21:46:29 -07:00
• aeb8002b2b Move backend to root directory Harkamal Randhawa 2026-03-04 17:34:43 -07:00
• 3f82142d3a Remove migrations and tests Harkamal Randhawa 2026-03-04 17:28:41 -07:00
• 40c88c9162 Fix compilation issues Harkamal Randhawa 2026-03-04 17:21:22 -07:00
• 0df6d931f2 Add sales and refunds with inventory management Harkamal Randhawa 2026-03-04 17:18:53 -07:00
• 883d1d6baa Add admin services and controllers Harkamal Randhawa 2026-03-04 17:14:42 -07:00
• 33bbb94a37 Add staff services and controllers Harkamal Randhawa 2026-03-04 17:10:23 -07:00
• cb432fb2b1 Add UI-ready DTOs with joined fields Harkamal Randhawa 2026-03-04 17:05:29 -07:00
• 06191d2958 Add entities and repositories Harkamal Randhawa 2026-03-04 17:03:42 -07:00
• 77dcfa3122 Implement JWT authentication Harkamal Randhawa 2026-03-04 17:01:54 -07:00
• 8612835c82 Initialize Spring Boot project Harkamal Randhawa 2026-03-04 16:59:10 -07:00
• 309a209ecd Add local properties template Harkamal Randhawa 2026-03-02 15:02:45 -07:00
• 84279337b6 Remove IDE configuration files Harkamal Randhawa 2026-03-02 15:02:26 -07:00
• effa429ae0 Fix AGP compatibility Harkamal Randhawa 2026-03-02 14:52:42 -07:00
• d1675643e5 initial commit Alex 2026-03-02 13:43:20 -07:00
• 9c266a5b00 Merge pull request #32 from RecentRunner/refund-system Harkamal 2026-03-02 20:31:44 +00:00
• ccce10b9d6 Reduce sales table column widths to prevent crowding Harkamal Randhawa 2026-03-02 13:28:07 -07:00
• 645b6c2bce Center logo and make it clickable to navigate to Analytics Harkamal Randhawa 2026-03-02 13:20:52 -07:00
• bde356face Increase logo sizes on login and sidebar Harkamal Randhawa 2026-03-02 13:17:21 -07:00
• 4e33877797 Enlarge logo and remove Pet Shop Manager text Harkamal Randhawa 2026-03-02 13:15:21 -07:00
• 657eeae5cf Convert logos to PNG for JavaFX compatibility Harkamal Randhawa 2026-03-02 13:13:17 -07:00
• 693f8bff74 Add logos to login screen and sidebar Harkamal Randhawa 2026-03-02 13:11:43 -07:00
• a6090dc0d0 Add images folder for logos and assets Harkamal Randhawa 2026-03-02 13:08:48 -07:00
• 22957e1179 Hide pie chart labels to fix overlap Harkamal Randhawa 2026-03-02 13:07:19 -07:00
• 36a516f878 Remove migration file, schema already in main SQL Harkamal Randhawa 2026-03-02 13:01:18 -07:00
• cbed5e4e0c Implement refund system for sales Harkamal Randhawa 2026-02-28 19:28:25 -07:00
• 92d883ee43 Merge pull request #31 from RecentRunner/analytics-screen Harkamal 2026-03-01 02:07:49 +00:00
• e2973729b4 Update UI and remove staff creation from login Harkamal Randhawa 2026-02-28 19:04:23 -07:00
• 2159d0762a Remove dollar signs from FXML text attributes Harkamal Randhawa 2026-02-28 14:36:27 -07:00
• 2f653acac6 Fix FXML errors and make Analytics accessible to all users Harkamal Randhawa 2026-02-28 14:34:11 -07:00
• f503a7e2b6 Add sales analytics screen Harkamal Randhawa 2026-02-28 14:25:55 -07:00
• 8f77fea963 fixed the issues with main Harkamal Randhawa 2026-02-25 11:23:44 -07:00
• 4dc5cae199 Add getSaleLineItems and createSale methods Harkamal Randhawa 2026-02-25 10:52:04 -07:00
• 07100f658b Resolve stash conflicts and integrate team changes Harkamal Randhawa 2026-02-25 10:44:10 -07:00
• 844c86bd52 Merge main into fix-productsupplier-table-name Harkamal Randhawa 2026-02-25 10:42:20 -07:00
• 96b50a21be Add multi-row selection and deletion to all tables Harkamal Randhawa 2026-02-25 10:08:47 -07:00
• 13684f97de Add DELETE key and Enter-to-confirm to all tables Harkamal Randhawa 2026-02-25 09:42:34 -07:00
• 19593af688 Fix sale view loading error Harkamal Randhawa 2026-02-25 09:35:58 -07:00
• 8077d7729a Fix sale-view loading error by suppressing error dialogs during initialization Harkamal Randhawa 2026-02-25 09:32:21 -07:00
• ffa45044e4 Add error dialog for view loading failures and fix btnPurchaseOrdersClicked signature Harkamal Randhawa 2026-02-25 09:21:18 -07:00
• 82bbe79d01 Fix productSupplier table name case sensitivity and add run configurations Harkamal Randhawa 2026-02-25 09:07:59 -07:00
• 2d67dd2d62 Merge pull request #30 from RecentRunner/mergefix Harkamal 2026-02-24 20:28:05 -07:00
• 13e8c01a28 Merge conflict resolution and updates Harkamal Randhawa 2026-02-24 20:26:50 -07:00
• 208aaae652 Merge pull request #29 from RecentRunner/AdoptionInventory Harkamal Randhawa 2026-02-24 16:46:54 -07:00
• d551289342 Merge branch 'main' into AdoptionInventory Harkamal Randhawa 2026-02-24 16:46:46 -07:00
• 40300d2fc0 Merge pull request #28 from RecentRunner/Pets Harkamal Randhawa 2026-02-24 16:28:14 -07:00
• dc538776c1 Pushing adoption and inventory augmentedpotato 2026-02-24 16:12:48 -07:00
• 2fe183b18e Merge pull request #27 from RecentRunner/branch3 Harkamal Randhawa 2026-02-24 16:02:26 -07:00
• de4fcca36f Update ServiceDialogController.java Nikitha 2026-02-24 13:52:21 -07:00
• 34a0e639da PurchaseOrder Display(Data) Nikitha 2026-02-24 13:52:14 -07:00
• 98979efd46 PurchaseOrder Update Nikitha 2026-02-23 16:31:30 -07:00
• 0cfb5e3cce Updated service (time validation) Nikitha 2026-02-23 16:11:20 -07:00
• c3ed8b0921 Customer liked with appointment table Nikitha 2026-02-23 16:10:51 -07:00
• 287995b22c Adding PurchaseOrder(view only) Nikitha 2026-02-23 16:09:53 -07:00
• 4fcaa7f2eb Appointment page Nikitha 2026-02-23 16:08:55 -07:00
• 8bb502c4cc updated service Nikitha 2026-02-23 08:49:12 -07:00
• 567a77c3a7 Update Service Nikitha 2026-02-22 18:30:12 -07:00
• 1f784f72d1 appionmeent,service Nikitha 2026-02-22 18:21:22 -07:00
• 1e22ff972f Merge pull request #26 from RecentRunner/main Harkamal Randhawa 2026-02-22 18:07:16 -07:00
• 68e482ffa0 Merge pull request #25 from RecentRunner/rbac Harkamal Randhawa 2026-02-22 17:41:07 -07:00
• bbf06456f5 comments Harkamal Randhawa 2026-02-22 17:39:42 -07:00
• a12af3f0ee Implement RBAC with login screen for admin and staff roles Harkamal Randhawa 2026-02-21 13:27:50 -07:00
• 168400a6b3 Dialog view now exists augmentedpotato 2026-02-20 20:16:35 -07:00
• edf5bb7a7e Appoinment,service,Purchase fxml Nikitha 2026-02-19 19:38:14 -07:00
• fb16da91e2 Merge pull request #24 from RecentRunner/Pets Harkamal Randhawa 2026-02-11 10:10:36 -07:00
• bcb383c40a Pets CRUD augmentedpotato 2026-02-11 08:40:31 -07:00
• 12020a2feb Fixed DB connection and java version issue Harkamal Randhawa 2026-02-10 16:35:49 -07:00
• a2dd913abd Merge pull request #14 from RecentRunner/fixes Harkamal Randhawa 2026-02-10 09:18:41 -07:00
• c2294d2faa Added an example connection file and also added proper error tracing Harkamal Randhawa 2026-02-10 09:15:20 -07:00
• e8322cb8f5 Added docker compose for consistent MySQL setup Harkamal Randhawa 2026-02-10 09:10:32 -07:00
• 117e7010f6 Merge pull request #13 from RecentRunner/CURDProductSupplier Harkamal Randhawa 2026-02-04 22:12:13 -07:00
• b53dcf10a7 Added CRUD to productSuppliers Alex 2026-02-04 19:05:41 -07:00
• ccc9a67d8b Merge pull request #12 from RecentRunner/CRUDProducts Harkamal Randhawa 2026-02-04 17:03:23 -07:00
• 07a6d3bfc6 Added CRUD to Products and added Validation to dialog Alex 2026-02-03 20:02:46 -07:00
• 310b66329f Added CRUD to Suppliers Alex 2026-02-01 18:43:35 -07:00
• d11f8070ca Fixed Views for Product and Suppliers Alex 2026-02-01 14:56:00 -07:00
• 47fe06a5c3 Added connection to database Alex 2026-01-31 17:52:30 -07:00
• d4fe78b65f Merge branch 'main' of https://github.com/RecentRunner/group-2-threaded-project-petshop-desktop NikithaKommidi89 2026-01-30 19:02:43 -07:00
• 2f90757229 Database NikithaKommidi89 2026-01-30 19:02:19 -07:00
• cb6a389a6a initial commit augmentedpotato 2026-01-30 18:54:57 -07:00
• 5f42633350 Added UI Alex 2026-01-28 18:48:36 -07:00