Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5024 Reintroduce tokens for TBL customisation

They were removed by mistake.

Merge branch 'v4.0' into LDEV-4886

  1. … 2 more files in changeset.
LDEV-5039 Do not hide QB after question add. Make AE questions collapse.

LDEV-4886 Automated tests for v4.0

  1. … 19 more files in changeset.
LDEV-5029 Make IRA question collapsible in TBL template

LDEV-5024 Fix layout issues in TBL template

  1. … 1 more file in changeset.
LDEV-5024 Import QB questions to AE in TBL template

  1. … 4 more files in changeset.
LDEV-5024 Close QB panel after importing a question

LDEV-5024 Import question from QB to TBL template wizard

  1. … 2 more files in changeset.
LDEV-5024 Add "question from bank" button to TBL template wizard

  1. … 1 more file in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 193 more files in changeset.
LDEV-4993 Remove unnecessary characters from TBL authoring page

LDEV-4932 Add CSRF to QB bank calls

  1. … 32 more files in changeset.
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

  1. … 92 more files in changeset.
LDEV-4932 Start using /common/taglibs.jsp in lams_central

  1. … 54 more files in changeset.
LDEV-4887 QTI import done within TBL template

  1. … 3 more files in changeset.
LDEV-4887 Adding id, classes to make automated testing faster

  1. … 5 more files in changeset.
LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

  1. … 7 more files in changeset.
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

  1. … 7 more files in changeset.
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

  1. … 2 more files in changeset.
LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

  1. … 3 more files in changeset.
LDEV-4829 Error msg and text improvements, supports mark entry

  1. … 9 more files in changeset.
LDEV-4829 Wording tweaks and tool tips added to templates

  1. … 5 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 90 more files in changeset.
LDEV-4829 QTI Import window appears centered on screen.

LDEV-4829 Fixed incompatibility between x-editable and jquery-validation

LDEV-4829 Application Exercise functionality completed, can edit titles

  1. … 11 more files in changeset.
LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

  1. … 6 more files in changeset.
LDEV-4829 Activities removable in build, RAT and AE have QTI Import

    • -0
    • +29
    ./tool/assessmentQTI.jsp
    • -0
    • +22
    ./tool/mcquestionQTI.jsp
  1. … 9 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 388 more files in changeset.