Merge branch 'master' of scm.thm.de:arsnova/arsnova-war
Showing
- README.md 55 additions, 14 deletionsREADME.md
- pom.xml 3 additions, 2 deletionspom.xml
- src/main/java/de/thm/arsnova/FeedbackStorage.java 1 addition, 4 deletionssrc/main/java/de/thm/arsnova/FeedbackStorage.java
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 0 additions, 2 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 1 addition, 3 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/entities/LoggedIn.java 2 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/LoggedIn.java
- src/main/java/de/thm/arsnova/entities/Session.java 5 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/Session.java
- src/main/java/de/thm/arsnova/events/Publisher.java 1 addition, 2 deletionssrc/main/java/de/thm/arsnova/events/Publisher.java
- src/main/java/de/thm/arsnova/services/QuestionService.java 3 additions, 0 deletionssrc/main/java/de/thm/arsnova/services/QuestionService.java
- src/main/java/de/thm/arsnova/services/UserSessionService.java 1 addition, 1 deletion...main/java/de/thm/arsnova/services/UserSessionService.java
- src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 2 additions, 2 deletions...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
- src/main/webapp/WEB-INF/web.xml 4 additions, 0 deletionssrc/main/webapp/WEB-INF/web.xml
- src/site/apt/development.apt 0 additions, 127 deletionssrc/site/apt/development.apt
- src/site/apt/index.apt 1 addition, 1 deletionsrc/site/apt/index.apt
- src/site/apt/installation.apt 0 additions, 111 deletionssrc/site/apt/installation.apt
- src/site/site.xml 3 additions, 3 deletionssrc/site/site.xml
- src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java 0 additions, 4 deletions...ava/de/thm/arsnova/controller/FeedbackControllerTest.java
- src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java 0 additions, 3 deletions...est/java/de/thm/arsnova/services/FeedbackServiceTest.java
- src/test/java/de/thm/arsnova/services/SessionServiceTest.java 0 additions, 1 deletion...test/java/de/thm/arsnova/services/SessionServiceTest.java
Please register or sign in to comment