Clone
Marcin Cieslak
committed
on 20 Apr 20
LDEV-5002 Add Etherpads after each question in Assessment
Conflicts:
lams_tool_assessment/conf/language/lams/ApplicationResources.propertie… Show more
LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

        lams_tool_assessment/conf/language/lams/ApplicationResources.properties

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

        lams_tool_assessment/web/pages/learning/learning.jsp

Show less