lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5386 Configuration file management

LDEV-5388 Reintroduce user create date to their edit form

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

  1. … 15 more files in changeset.
LDEV-5387 Remove unnecessary checkbox from global role assignment

LDEV-5386 Library management

  1. … 69 more files in changeset.
LDEV-5386 IntelliJ configuration file maintenance

  1. … 71 more files in changeset.
# WARNING: head commit changed in the meantime

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

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

  1. … 1 more file in changeset.
Merge branch 'LDEV-5375' into LAI-2

  1. … 1 more file in changeset.
LDEV-5386 Add per moduule IntelliJ configuration files

  1. … 86 more files in changeset.
LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

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

LDEV-5383 Fix "select role for all users" button

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

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

  1. … 3 more files in changeset.
LDEV-5383 Allow adding user to all lessons in a course

  1. … 2 more files in changeset.
LDEV-4501 Prevent exceptions on missing user references from LogEvents

This time in entity there is no reference to User objects. It reflects

DB structure without foreign key: there is just integer ID.

  1. … 2 more files in changeset.
LDEV-4501 Prevent exceptions on missing user references from LogEvents

# WARNING: head commit changed in the meantime

Merge branch 'LDEV-5381' into v4.7

  1. … 1 more file in changeset.
LDEV-5277 Allow duplicate prefixes for LTI consumers

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

LDEV-5277 Allow duplicate prefixes for integrated servers

  1. … 1 more file in changeset.
LDEV-5375 Add AI configuration page

  1. … 1 more file in changeset.
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.