• Christoph Thelen's avatar
    Merge remote-tracking branch 'legacy/master' · f90ffe3d
    Christoph Thelen authored
    Merge completed, but the work is not done yet. There are
    several known issues:
    
    * MC answers are not shown in the question details panel
    * answers are not highlighted correctly
    * Question display & answering needs more testing
    
    Conflicts:
    	pom.xml
    	src/main/webapp/app/controller/Archive.js
    	src/main/webapp/app/controller/Questions.js
    	src/main/webapp/app/controller/Ranking.js
    	src/main/webapp/app/controller/Sessions.js
    	src/main/webapp/app/model/Feedback.js
    	src/main/webapp/app/model/UserRanking.js
    	src/main/webapp/app/models/Question.js
    	src/main/webapp/app/models/Session.js
    	src/main/webapp/app/proxy/RestProxy.js
    	src/main/webapp/app/routes.js
    	src/main/webapp/app/st2-app.js
    	src/main/webapp/app/view/CheckFullscreenPanel.js
    	src/main/webapp/app/view/FreetextAnswerPanel.js
    	src/main/webapp/app/view/FreetextQuestion.js
    	src/main/webapp/app/view/LoginPanel.js
    	src/main/webapp/app/view/Question.js
    	src/main/webapp/app/view/archive/CoursePanel.js
    	src/main/webapp/app/view/archive/QuestionPanel.js
    	src/main/webapp/app/view/archive/TabPanel.js
    	src/main/webapp/app/view/feedback/StatisticPanel.js
    	src/main/webapp/app/view/home/HomePanel.js
    	src/main/webapp/app/view/home/MySessionsPanel.js
    	src/main/webapp/app/view/home/NewSessionPanel.js
    	src/main/webapp/app/view/speaker/AudienceQuestionPanel.js
    	src/main/webapp/app/view/speaker/InClass.js
    	src/main/webapp/app/view/speaker/NewQuestionPanel.js
    	src/main/webapp/app/view/speaker/QuestionDetailsPanel.js
    	src/main/webapp/app/view/speaker/QuestionStatisticChart.js
    	src/main/webapp/app/view/user/InClass.js
    	src/main/webapp/app/view/user/QuestionPanel.js
    	src/main/webapp/app/view/user/RankingPanel.js
    	src/main/webapp/app/views/tabPanel.js
    	src/main/webapp/developer.html
    	src/main/webapp/lib/sencha1.1.1/ARSnovaCombined.jsb3
    f90ffe3d