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

LDEV-4832 Secure access to editing QB question

WEB-006

  1. … 1 more file in changeset.
LDEV-4828 Secure access to other monitors' collections

WEB-001

  1. … 1 more file in changeset.
LDEV-3959 Secure access to CKEditor file manager view

WEB-002

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

  1. … 7 more files in changeset.
LDEV-5354 Show growl-like message on course URL copy to clipboard

LDEV-5354 Move course URL copy button to More Options menu

  1. … 3 more files in changeset.
LDEV-5354 Add course URL on index page

  1. … 6 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 12 more files in changeset.
LDEV-5348 improve course buttons layout

LDEV-5348 hide excess txt in btn

LDEV-5348 Update to new logo

  1. … 2 more files in changeset.
LDEV-4601 Modify date format for scheduling lesson start and end

LDEV-5324 Allow creating essay questions new versions

LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

  1. … 2 more files in changeset.
LDEV-5350 Add grouping preview and group count to Add Lesson dialog

  1. … 1 more file in changeset.
LDEV-5330 adding font-awesome6 to web.xml

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

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

    • -105
    • +94
    ./includes/javascript/groups.js
  1. … 4 more files in changeset.
LDEV-3119 Any org super user can edit course groupings

Till now only Course Manager could edit Course Groupings. It is an

unnecessary limitation. Plus integrations set only monitor and author

roles in course, never course manager. And some universities would like

to be able to work with course groupings.

    • -103
    • +92
    ./includes/javascript/orgGroup.js
  1. … 4 more files in changeset.
LDEV-5200 Update Bootstrap to 5.2.3

It also addresses Sass warnings for missing units.

  1. … 25 more files in changeset.