-
- Downloads
Merge branch 'develop' into 'issueThirtyOne'
fixed small bug See merge request !88
No related branches found
No related tags found
Showing
- src/main/java/com/example/clientproject/data/misc/MiscQueries.java 1 addition, 1 deletion...java/com/example/clientproject/data/misc/MiscQueries.java
- src/main/java/com/example/clientproject/data/misc/MiscQueriesImpl.java 53 additions, 4 deletions.../com/example/clientproject/data/misc/MiscQueriesImpl.java
- src/main/java/com/example/clientproject/data/shops/Shops.java 4 additions, 0 deletions...main/java/com/example/clientproject/data/shops/Shops.java
- src/main/java/com/example/clientproject/data/userStampBoards/UserStampBoardsRepo.java 1 addition, 4 deletions...ientproject/data/userStampBoards/UserStampBoardsRepo.java
- src/main/java/com/example/clientproject/services/RecommendationGenerator.java 148 additions, 0 deletions...ample/clientproject/services/RecommendationGenerator.java
- src/main/java/com/example/clientproject/services/ShopActiveService.java 46 additions, 0 deletions...com/example/clientproject/services/ShopActiveService.java
- src/main/java/com/example/clientproject/services/ShopDeleter.java 20 additions, 0 deletions.../java/com/example/clientproject/services/ShopDeleter.java
- src/main/java/com/example/clientproject/web/controllers/AdminController.java 50 additions, 3 deletions...xample/clientproject/web/controllers/AdminController.java
- src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java 5 additions, 3 deletions...xample/clientproject/web/controllers/BusinessDetails.java
- src/main/java/com/example/clientproject/web/controllers/userSettingsPage/UserSettingsController.java 82 additions, 9 deletions.../controllers/userSettingsPage/UserSettingsController.java
- src/main/java/com/example/clientproject/web/forms/userSettingsPage/NameEmailProfileChangeForm.java 0 additions, 6 deletions...eb/forms/userSettingsPage/NameEmailProfileChangeForm.java
- src/main/java/com/example/clientproject/web/forms/userSettingsPage/PasswordChangeForm.java 0 additions, 3 deletions...roject/web/forms/userSettingsPage/PasswordChangeForm.java
- src/main/java/com/example/clientproject/web/restControllers/Recommendations.java 38 additions, 0 deletions...le/clientproject/web/restControllers/Recommendations.java
- src/main/java/com/example/clientproject/web/restControllers/ToggleShopActive.java 60 additions, 0 deletions...e/clientproject/web/restControllers/ToggleShopActive.java
- src/main/java/com/example/clientproject/web/restControllers/UserSettings.java 139 additions, 0 deletions...ample/clientproject/web/restControllers/UserSettings.java
- src/main/java/com/example/clientproject/web/restControllers/userSettingsAPI.java 0 additions, 7 deletions...le/clientproject/web/restControllers/userSettingsAPI.java
- src/main/resources/database/Data Script/script.sql 3 additions, 3 deletionssrc/main/resources/database/Data Script/script.sql
- src/main/resources/database/schema.sql 21 additions, 0 deletionssrc/main/resources/database/schema.sql
- src/main/resources/static/css/deleteShop.css 26 additions, 0 deletionssrc/main/resources/static/css/deleteShop.css
- src/main/resources/static/css/reward_card.css 4 additions, 0 deletionssrc/main/resources/static/css/reward_card.css
Loading
Please register or sign in to comment