There was an error fetching the commit references. Please try again later.
Merge branch 'master' into upstream
Showing
- pom.xml 1 addition, 1 deletionpom.xml
- src/main/java/de/thm/arsnova/controller/LoginController.java 3 additions, 3 deletionssrc/main/java/de/thm/arsnova/controller/LoginController.java
- src/main/java/de/thm/arsnova/controller/WelcomeController.java 1 addition, 1 deletion...ain/java/de/thm/arsnova/controller/WelcomeController.java
- src/main/webapp/WEB-INF/spring/arsnova-servlet.xml 18 additions, 11 deletionssrc/main/webapp/WEB-INF/spring/arsnova-servlet.xml
- src/main/webapp/WEB-INF/spring/spring-main.xml 6 additions, 6 deletionssrc/main/webapp/WEB-INF/spring/spring-main.xml
- src/main/webapp/WEB-INF/spring/spring-security.xml 3 additions, 3 deletionssrc/main/webapp/WEB-INF/spring/spring-security.xml
- src/main/webapp/WEB-INF/web.xml 6 additions, 0 deletionssrc/main/webapp/WEB-INF/web.xml
- src/test/java/de/thm/arsnova/AbstractSpringContextTestBase.java 0 additions, 80 deletions...st/java/de/thm/arsnova/AbstractSpringContextTestBase.java
- src/test/java/de/thm/arsnova/Selenium2Test.java 0 additions, 1 deletionsrc/test/java/de/thm/arsnova/Selenium2Test.java
- src/test/java/de/thm/arsnova/WiringTest.java 0 additions, 35 deletionssrc/test/java/de/thm/arsnova/WiringTest.java
- src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java 2 additions, 2 deletions...ava/de/thm/arsnova/controller/FeedbackControllerTest.java
- src/test/java/de/thm/arsnova/controller/LoginControllerTest.java 1 addition, 1 deletion...t/java/de/thm/arsnova/controller/LoginControllerTest.java
- src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java 1 addition, 1 deletion.../arsnova/controller/QuestionByLecturerControllerTest.java
- src/test/java/de/thm/arsnova/controller/SessionControllerTest.java 1 addition, 1 deletion...java/de/thm/arsnova/controller/SessionControllerTest.java
- src/test/java/de/thm/arsnova/controller/StatisticsControllerTest.java 1 addition, 1 deletion...a/de/thm/arsnova/controller/StatisticsControllerTest.java
- src/test/java/de/thm/arsnova/controller/WelcomeControllerTest.java 26 additions, 5 deletions...java/de/thm/arsnova/controller/WelcomeControllerTest.java
- src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java 1 addition, 1 deletion...est/java/de/thm/arsnova/services/FeedbackServiceTest.java
- src/test/java/de/thm/arsnova/services/QuestionServiceTest.java 1 addition, 1 deletion...est/java/de/thm/arsnova/services/QuestionServiceTest.java
- src/test/java/de/thm/arsnova/services/SessionServiceTest.java 1 addition, 1 deletion...test/java/de/thm/arsnova/services/SessionServiceTest.java
- src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java 1 addition, 1 deletion...t/java/de/thm/arsnova/services/StatisticsServiceTest.java
Please register or sign in to comment