Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

  1. … 105 more files in changeset.
LDEV-5397 migrate Assessment's learning to Bootstrap 5

  1. … 34 more files in changeset.
LDEV-5397 further bootstrap 5 related changes

Also

* change bootstrap classes from col-*-offset-* to offset-*-

* deprecated form-group

* .hidden-xs to .d-none .d-sm-block

* .pull-left to .float-start

* .pull-right to .float-end

* add class="activity-bottom-buttons"

  1. … 116 more files in changeset.
LDEV-5187 Combine Mark Hedging and Assessment justifications

Mark Hedging questions have own settings for justification. We should

have a consistent user experience in Assessment, not matter where

justification is set up: on Assessment activity level or on Mark Hedging

question level.

  1. … 9 more files in changeset.
LDEV-3387 Filter textarea data before (auto)save answers

Until now lams:textarea JS function was run only on textarea "change"

event. This event is run when the input looses focus. If an user keeps

writing in the same textare and autosave or time expired autosubmit

kicks in, data in the hidden input is not refreshed. Old data is sent

and stored in DB.

Now the data is refreshed before autosave and submit.

  1. … 1 more file in changeset.
LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

  1. … 23 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

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

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

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

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

  1. … 54 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-4746 Migrate Assessment to QB

  1. … 80 more files in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

  1. … 5 more files in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

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

  1. … 391 more files in changeset.
LDEV-4440 Reintroduce custom textarea tags

  1. … 9 more files in changeset.
LDEV-4440 Assessment noStruts

  1. … 74 more files in changeset.
LDEV-4329 Fixed marked hedging questions' table formatting

  1. … 2 more files in changeset.
LDEV-4271 Refactor Assessment code * use DTO instead of model classes for carrying interim information * split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

  1. … 44 more files in changeset.
LDEV-4201: remove feedback formatting from questions

  1. … 6 more files in changeset.
LDEV-4201: remove feedback formatting from questions

  1. … 5 more files in changeset.
LDEV-3716: Tweaked colours to match and switched images to font awesome

  1. … 9 more files in changeset.
LDEV-3716 Update Assessment learner to bootstrap

  1. … 23 more files in changeset.
LDEV-3522 Make adding justification textareas optional

  1. … 9 more files in changeset.
LDEV-3522 Make adding justification textareas optional

  1. … 9 more files in changeset.
LDEV-3522 Added justification textareas to the hedging marks question type

  1. … 3 more files in changeset.
LDEV-3522 Added justification textareas to the hedging marks question type

  1. … 4 more files in changeset.
LDEV-3489 New question type for marks hedging

    • -0
    • +109
    ./markhedging.jsp
  1. … 21 more files in changeset.
LDEV-3489 fix results page markup

LDEV-3489 New question type for marks hedging

    • -0
    • +107
    ./markhedging.jsp
  1. … 24 more files in changeset.