Fisheye: Diff - lams-github/lams_central/web/includes/javascript/main.js

Tree
Options

More

e6dc4db

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

47f01da

Merge branch 'master' into develop
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
# lams_monitoring/conf/language/lams/ApplicationResources.properties
# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_chat/conf/language/lams/ApplicationResources.properties
# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_daco/conf/language/lams/ApplicationResources.properties
# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_forum/conf/language/lams/ApplicationResources.properties
# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_images/conf/language/lams/ApplicationResources.properties
# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_leader/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_nb/conf/language/lams/ApplicationResources.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_preview/conf/language/lams/ApplicationResources.properties
# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_survey/conf/language/lams/ApplicationResources.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_task/conf/language/lams/ApplicationResources.properties
# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_vote/conf/language/lams/ApplicationResources.properties
# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

04 Dec 19 Andrey Balan 47f01daecb191d1ca81eaf131b1d063b2bc640b5

Loading ...

Atlassian Fisheye Git analysis (Version:4.8.10 Build:20220620091927 2022-06-20 09:21) - Administration - Page generated 2025-05-15 04:51 +0800

Fisheye (Server) Unlimited Users: Open Source License License registered to Learning Activity Management System (LAMS).

Version 4.8.13 is available.