Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5395 Add main frame for learner UI

  1. … 53 more files in changeset.
LDEV-5395 Open learner UI in same tab instead of pop up

  1. … 2 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 33 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 33 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

  1. … 6 more files in changeset.
LDEV-5083 Make img-responsive class behave like in Bootstrap 3

LDEV-5382 Add "shuffle questions" in advanced RAT section of TBL wizard

  1. … 4 more files in changeset.
LAI-1 Use Bootstrap to syle question choice page

LAI-1 Make OpenAI-generated MCQ questions editable

  1. … 1 more file in changeset.
LDEV-5283 Allow removing transitions in authoring with bin button

LDEV-5083 Remove dark background on user yellow icon

LDEV-5375 Add OpenAI question import to Assessment

    • -138
    • +153
    ./questions/questionChoice.jsp
  1. … 10 more files in changeset.
LDEV-5329 Fix reintroduced custom monitoring URL for LTI Advantage

LDEV-5329 Reintroduce custom monitoring URL for LTI Advantage

LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

  1. … 36 more files in changeset.
LDEV-5371 Change maxlength for email and username fields on "Forgotten password?" page

Change from 50 to 256

LDEV-5371 Change maxlength for email and username fields on "Forgotten password?" page

Change from 50 to 256

LDEV-5368 Add "img-responsive" class to generated image tags

    • -1
    • +3
    ./ckeditor/plugins/uploadimage/plugin.js
LDEV-5368 Add upload image plugin to CKEditor

    • -0
    • +154
    ./ckeditor/plugins/uploadimage/plugin.js
    • -0
    • +34
    ./ckeditor/plugins/uploadwidget/dev/cors.html
    • -0
    • +55
    ./ckeditor/plugins/uploadwidget/dev/filereaderplugin.js
    • -0
    • +97
    ./ckeditor/plugins/uploadwidget/dev/upload.html
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/az.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/bg.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/ca.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/cs.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/da.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/de-ch.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/de.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/el.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/en-au.js
    • -0
    • +12
    ./ckeditor/plugins/uploadwidget/lang/en.js
  1. … 39 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 38 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

    • -1
    • +1
    ./authoring/template/tool/assessmentQTI.jsp
    • -1
    • +1
    ./authoring/template/tool/mcquestionQTI.jsp
  1. … 38 more files in changeset.
LDEV-3000 Secure access to QTI and Word question import pages

# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 7 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 34 more files in changeset.
LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

    • -6
    • +0
    ./includes/javascript/jquery-ui.slider.js
  1. … 1 more file in changeset.
LDEV-5257 Update jQuery UI from 1.13.0 to 1.13.2

WEB-008

LDEV-5257 Update jQuery from 3.6.0 to 3.6.3

WEB-008