Merge remote-tracking branch 'origin/main' into main
# Conflicts: # SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java # SchedulerApp/src/main/resources/com/example/schedulerapp/timeOffPopup.fxml
No related branches found
No related tags found
Showing
- SchedulerApp/src/main/java/com/example/scheduler_server/ScheduleServer.java 6 additions, 3 deletions...ain/java/com/example/scheduler_server/ScheduleServer.java
- SchedulerApp/src/main/java/com/example/scheduler_server/server.properties 7 additions, 0 deletions.../main/java/com/example/scheduler_server/server.properties
- SchedulerApp/src/main/java/com/example/schedulerapp/AvailabilityView.java 0 additions, 2 deletions.../main/java/com/example/schedulerapp/AvailabilityView.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java 207 additions, 96 deletions...pp/src/main/java/com/example/schedulerapp/Controller.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Model.java 22 additions, 17 deletions...ulerApp/src/main/java/com/example/schedulerapp/Model.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ModelTestSuite.java 0 additions, 1 deletion...rc/main/java/com/example/schedulerapp/ModelTestSuite.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ScheduleApp.java 6 additions, 1 deletion...p/src/main/java/com/example/schedulerapp/ScheduleApp.java
- SchedulerApp/src/main/resources/com/example/schedulerapp/addShiftPopup.fxml 1 addition, 1 deletion...ain/resources/com/example/schedulerapp/addShiftPopup.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/employeeHeader.fxml 1 addition, 1 deletion...in/resources/com/example/schedulerapp/employeeHeader.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/headerManager.fxml 1 addition, 1 deletion...ain/resources/com/example/schedulerapp/headerManager.fxml
Loading
Please register or sign in to comment