Fisheye: Diff - lams-github/lams_central/web/questions/questionFile.jsp

Tree
Options

e376b24

LDEV-4949 import questions from Word files

31 Mar 20 Andrey Balan e376b240aecf9b255b8b26fe22c3d33c70f67ddb

Merge branch 'master' into v4.0
# Conflicts:
# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_build/build.xml
# lams_build/liblist.txt
# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_central/web/authoringConfirm.jsp
# lams_central/web/common/taglibs.jsp
# lams_central/web/includes/javascript/authoring/authoringGeneral.js
# lams_central/web/includes/javascript/outcome.js
# lams_central/web/outcome/outcomeEdit.jsp
# lams_central/web/outcome/outcomeManage.jsp
# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
# lams_tool_laqa/web/authoring/newQuestionBox.jsp
# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java
# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_scratchie/web/pages/authoring/basic.jsp
# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

09 Jan 20 Andrey Balan e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e

Loading ...