Fisheye: Diff - lams-github/lams_tool_laqa/web/learning/AnswersContent.jsp

Tree
Options

242fb55

Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_admin/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources.properties
lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_lamc/conf/language/lams/ApplicationResources.properties
lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
lams_tool_laqa/web/learning/Notebook.jsp
lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

06 Dec 19 Marcin Cieslak 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b

02ce40b

Merge remote-tracking branch 'origin/develop' into LDEV-4745
Conflicts:
lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
lams_tool_assessment/web/pages/learning/learning.jsp
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
lams_tool_scratchie/web/pages/learning/learning.jsp

19 Nov 19 Marcin Cieslak 02ce40b60524aa33d326fbda824dcd43f566ab94

Loading ...