Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -11
    • +0
    ./learning/SequentialAnswersContent.jsp
  1. … 8 more files in changeset.
LDEV-4919 Don't focus on question answer

    • -17
    • +8
    ./learning/CombinedAnswersContent.jsp
    • -19
    • +3
    ./learning/SequentialAnswersContent.jsp
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

  1. … 21 more files in changeset.
LDEV-4900 Make other tools react to autosave command

  1. … 2 more files in changeset.
LDEV-4900 Distribute modified Page tag to all tools

  1. … 30 more files in changeset.
LDEV-4841 Set QB question content folder ID for new Q&A questions

  1. … 2 more files in changeset.
LDEV-4863 Q&A authoring to look more like Assessment essay authoring

    • -14
    • +15
    ./learning/SequentialAnswersContent.jsp
  1. … 3 more files in changeset.
LDEV-4865 Show question description in monitor

LDEV-4864 Show question body in Q&A learner

    • -13
    • +10
    ./learning/CombinedAnswersContent.jsp
    • -62
    • +53
    ./learning/IndividualLearnerResults.jsp
    • -2
    • +3
    ./learning/SequentialAnswersContent.jsp
  1. … 1 more file in changeset.
LDEV-4841 Migrate Q&A tool to QB

    • -51
    • +51
    ./authoring/AuthoringTabsHolder.jsp
    • -44
    • +181
    ./authoring/newQuestionBox.jsp
    • -2
    • +2
    ./learning/IndividualLearnerResults.jsp
    • -2
    • +2
    ./monitoring/MonitoringMaincontent.jsp
  1. … 31 more files in changeset.
LDEV-4840 Refine import QB questions feature

  1. … 2 more files in changeset.
LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 69 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 50 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. … 94 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

  1. … 35 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

  1. … 87 more files in changeset.
LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

    • -8
    • +10
    ./authoring/AuthoringTabsHolder.jsp
  1. … 12 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 34 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 43 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 43 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 120 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 50 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

  1. … 81 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

    • -9
    • +9
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -8
    • +6
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 380 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 43 more files in changeset.
LDEV-4759 Main page functional

  1. … 35 more files in changeset.
LDEV-4759 Panels are now cards.

    • -8
    • +8
    ./learning/IndividualLearnerResults.jsp
    • -5
    • +5
    ./learning/SequentialAnswersContent.jsp
  1. … 492 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

    • -1
    • +1
    ./monitoring/MonitoringMaincontent.jsp
  1. … 306 more files in changeset.
LDEV-4760 Fixed spacing in authoring criteria entry panel

    • -2
    • +4
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  1. … 32 more files in changeset.