Merge branch '2.x' (ea3c6cbd) · Commits · ARSnova / ARSnova Backend

There was an error fetching the commit references. Please try again later.

Commit ea3c6cbd authored 6 years ago by

Daniel Gerhardt

Browse files

Merge branch '2.x'

parents 91f9f499 43c8c5cb

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/cache/CacheBuster.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/cache/CacheBuster.java
src/main/java/de/thm/arsnova/cache/ScheduledCacheBuster.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/cache/ScheduledCacheBuster.java
src/main/java/de/thm/arsnova/config/SecurityConfig.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/config/SecurityConfig.java
src/main/java/de/thm/arsnova/controller/AbstractController.java 1 addition, 1 deletion

...in/java/de/thm/arsnova/controller/AbstractController.java
src/main/java/de/thm/arsnova/controller/CommentController.java 1 addition, 1 deletion

...ain/java/de/thm/arsnova/controller/CommentController.java
src/main/java/de/thm/arsnova/controller/ConfigurationController.java 1 addition, 1 deletion

...va/de/thm/arsnova/controller/ConfigurationController.java
src/main/java/de/thm/arsnova/controller/ControllerExceptionHandler.java 1 addition, 1 deletion

...de/thm/arsnova/controller/ControllerExceptionHandler.java
src/main/java/de/thm/arsnova/controller/ControllerExceptionHelper.java 17 additions, 0 deletions

.../de/thm/arsnova/controller/ControllerExceptionHelper.java
src/main/java/de/thm/arsnova/controller/DefaultControllerExceptionHandler.java 17 additions, 0 deletions

...arsnova/controller/DefaultControllerExceptionHandler.java
src/main/java/de/thm/arsnova/controller/MotdController.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/controller/MotdController.java
src/main/java/de/thm/arsnova/controller/PaginationController.java 1 addition, 1 deletion

.../java/de/thm/arsnova/controller/PaginationController.java
src/main/java/de/thm/arsnova/controller/WelcomeController.java 1 addition, 1 deletion

...ain/java/de/thm/arsnova/controller/WelcomeController.java
src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 1 addition, 1 deletion

...e/thm/arsnova/controller/v2/AuthenticationController.java
src/main/java/de/thm/arsnova/controller/v2/CourseController.java 1 addition, 1 deletion

...n/java/de/thm/arsnova/controller/v2/CourseController.java
src/main/java/de/thm/arsnova/controller/v2/SocketController.java 1 addition, 1 deletion

...n/java/de/thm/arsnova/controller/v2/SocketController.java
src/main/java/de/thm/arsnova/controller/v2/StatisticsController.java 1 addition, 1 deletion

...va/de/thm/arsnova/controller/v2/StatisticsController.java
src/main/java/de/thm/arsnova/event/ArsnovaEvent.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/event/ArsnovaEvent.java
src/main/java/de/thm/arsnova/event/ChangeScoreEvent.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/event/ChangeScoreEvent.java
src/main/java/de/thm/arsnova/event/DeleteFeedbackForRoomsEvent.java 1 addition, 1 deletion

...ava/de/thm/arsnova/event/DeleteFeedbackForRoomsEvent.java
src/main/java/de/thm/arsnova/event/FlipFlashcardsEvent.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/event/FlipFlashcardsEvent.java

with 52 additions and 18 deletions

Please register or to comment