lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

    • -5
    • +10
    ./web/WEB-INF/tags/StyledRating.tag
  1. … 41 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java

  1. … 1 more file in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

  1. … 4 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

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

    • -4
    • +78
    ./web/WEB-INF/tags/StyledRating.tag
  1. … 36 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

    • -2
    • +2
    ./web/organisation/deleteAllLessons.jsp
  1. … 42 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

    • -2
    • +2
    ./web/organisation/deleteAllLessons.jsp
  1. … 50 more files in changeset.
# WARNING: head commit changed in the meantime

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

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

WEB-005

    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  1. … 35 more files in changeset.
LDEV-1261 Skip empty row on admin import users

LDEV-5345 Updating English, Spanish, German, Greek

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

  1. … 8 more files in changeset.
LDEV-5354 Indicate that sysadmin setting also give course URL

LDEV-5348 Adding padding left and right

  1. … 11 more files in changeset.
DEV-4078 Fix missing Change Password button

LDEV-5200 Add proper padding to larger learner content

Before the patch it overlapped with progress bar on the left.

  1. … 32 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian, Chinese

  1. … 10 more files in changeset.
LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

  1. … 32 more files in changeset.
LDEV-5302 Fix access privileges for sysadmins

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

LDEV-1323 Allow empty user list in course

LDEV-5302 Do not shows sysadmin role in course role assignment

  1. … 1 more file in changeset.
LDEV-5348 Admin Ui improvements

Skip to main content based on Bootstrap 5.

LDEV-5348 General UI improvements for admin

  1. … 11 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

And fixing previously changed labels in admin

  1. … 7 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek, French, Norwegian

  1. … 17 more files in changeset.
LDEV-5302 All sysadmins are also allowed to do appadmin actions

  1. … 10 more files in changeset.
Merge branch 'LDEV-5336' into v4.7

    • -3
    • +6
    ./web/organisation/deleteAllLessons.jsp
  1. … 1 more file in changeset.
LDEV-5302 Fix access rights for appadmin

  1. … 1 more file in changeset.