Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

  1. … 9 more files in changeset.
LDEV-5397 remove obsolete jsps

  1. … 10 more files in changeset.
LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

    • -92
    • +10
    ./learning/submissionDeadline.jsp
  1. … 81 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. … 113 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Tasks

  1. … 7 more files in changeset.
LDEV-4917 Escape Uppy error message

Otherwise messages with apostrophe break file upload.

  1. … 7 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

  1. … 56 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

  1. … 56 more files in changeset.
LDEV-5331 Add missing title and autocomplete attr to submission deadline

    • -1
    • +1
    ./monitoring/parts/daterestriction.jsp
  1. … 17 more files in changeset.
LDEV-5250 Remove Pedagogical Planner integration with core LAMS

    • -80
    • +0
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 67 more files in changeset.
LDEV-5219 Use versioned JS import for gate check JS file

  1. … 54 more files in changeset.
LDEV-5219 Check gate after Task List activity

LDEV-5200 Remove obsolete icons

    • -1
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  1. … 111 more files in changeset.
LDEV-4391 Turn off auto complete for datetime picker fields

If a text input field is used for datetimepicker, having previously

chosen dates auto filled is annoying and makes it difficult to operate

the picker.

    • -1
    • +1
    ./monitoring/parts/daterestriction.jsp
  1. … 16 more files in changeset.
LDEV-5193 Use case-insensitive extension checking for Uppy upload

Also use built-in Uppy extension check where possible.

  1. … 16 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 82 more files in changeset.
LDEV-5104 Fix multiple Uppy instances file upload

LDEV-5092 Fix Arrow tag attributes in Task List tool authoring

LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
LDEV-4917 remove incorrect spacing

LDEV-4917 Add error pop up on attempt of uploading incorrect file

  1. … 10 more files in changeset.
LDEV-4917 In Task List make file upload smaller, without preview

LDEV-4917 Add Uppy upload to Task List tool

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

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 196 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

  1. … 41 more files in changeset.
LDEV-4932 Secure save tool authoring with CSRF Guard

  1. … 42 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 109 more files in changeset.
LDEV-4932 Adding CSRF to Task list

Adding CSRF protection to set verification for task list

  1. … 2 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

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