Merge branch 'dev' into 'master'
MVP See merge request !64
Showing
- .gitignore 36 additions, 39 deletions.gitignore
- .gitlab-ci.yml 6 additions, 5 deletions.gitlab-ci.yml
- .mvn/wrapper/maven-wrapper.jar 0 additions, 0 deletions.mvn/wrapper/maven-wrapper.jar
- .mvn/wrapper/maven-wrapper.properties 2 additions, 0 deletions.mvn/wrapper/maven-wrapper.properties
- mvnw 316 additions, 0 deletionsmvnw
- mvnw.cmd 188 additions, 0 deletionsmvnw.cmd
- page/index.html 0 additions, 11 deletionspage/index.html
- pom.xml 149 additions, 215 deletionspom.xml
- src/main/java/module-info.java 22 additions, 0 deletionssrc/main/java/module-info.java
- src/main/java/no/ntnu/idatt1005/MyApp.java 0 additions, 18 deletionssrc/main/java/no/ntnu/idatt1005/MyApp.java
- src/main/java/no/ntnu/idatt1005/data/MyEntity.java 0 additions, 37 deletionssrc/main/java/no/ntnu/idatt1005/data/MyEntity.java
- src/main/java/no/ntnu/idatt1005/repo/MyEntityRepo.java 0 additions, 46 deletionssrc/main/java/no/ntnu/idatt1005/repo/MyEntityRepo.java
- src/main/java/no/ntnu/idatt1005/view/MyWindow.java 0 additions, 34 deletionssrc/main/java/no/ntnu/idatt1005/view/MyWindow.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/PantryPal.java 81 additions, 0 deletionssrc/main/java/stud/ntnu/idatt1005/pantrypal/PantryPal.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/AddRecipeController.java 28 additions, 0 deletions.../idatt1005/pantrypal/controllers/AddRecipeController.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/Controller.java 34 additions, 0 deletions...stud/ntnu/idatt1005/pantrypal/controllers/Controller.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/CookBookController.java 178 additions, 0 deletions...u/idatt1005/pantrypal/controllers/CookBookController.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/HomeController.java 28 additions, 0 deletions.../ntnu/idatt1005/pantrypal/controllers/HomeController.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/LogInController.java 28 additions, 0 deletions...ntnu/idatt1005/pantrypal/controllers/LogInController.java
- src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/Observer.java 16 additions, 0 deletions...a/stud/ntnu/idatt1005/pantrypal/controllers/Observer.java
Loading
Please register or sign in to comment