lams_tool_doku

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

LDEV-5141 Secure access to gallery walk commands

LDEV-5120 Stop doKu timer on gallery walk start

LDEV-5120 Return correct HTTP code on gallery walk control Ajax call

LDEV-5083 Fix Gallery Walk controls for Boostrap 5

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.
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

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

WEB-005

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

WEB-005

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

WEB-005

    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  1. … 37 more files in changeset.
LDEV-5345 Updating English, Spanish, Greek

  1. … 22 more files in changeset.
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. … 34 more files in changeset.
Merge branch 'LDEV-5336' into v4.7

  1. … 3 more files in changeset.
LDEV-5331 Add submission deadline to Doku and Whiteboard

    • -0
    • +83
    ./web/pages/learning/submissionDeadline.jsp
    • -0
    • +36
    ./web/pages/monitoring/dateRestriction.jsp
  1. … 10 more files in changeset.
LDEV-4440 Provide leader progress check with proper response

LDEV-5120 Reset Gallery Walk state on tool content copy

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

Conflicts:

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

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

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

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

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

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 35 more files in changeset.
LDEV-5341 Refactor Security Service

  1. … 35 more files in changeset.
LDEV-5317 Fix time limit widget on doKu summary page

LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./web/WEB-INF/tags/FileUpload5.tag
  1. … 62 more files in changeset.
LDEV-5328 Set proper initial tool version so SQL scripts can kick in

  1. … 24 more files in changeset.
LDEV-5330 Improve accessibility by adding labels to buttons and inputs

  1. … 32 more files in changeset.
LDEV-5330 Merge changes made for tags

    • -0
    • +43
    ./web/WEB-INF/tags/Alert5.tag
  1. … 200 more files in changeset.
LDEV-5330 Merge changes made for sysadmin

It included upgrading to Bootstrap 5 and using UI guidelines set for

Monitoring UI.

    • -0
    • +534
    ./web/WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./web/WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./web/WEB-INF/tags/Widget.tag
  1. … 188 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

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

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_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

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

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 58 more files in changeset.
LDEV-5328 Squash DB patches and update versions

    • -54
    • +86
    ./db/sql/create_lams_tool_dokumaran.sql
  1. … 146 more files in changeset.
LDEV-5083 Add custom JSP tags than will be used in next version

    • -0
    • +40
    ./web/WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./web/WEB-INF/tags/Panel.tag
  1. … 93 more files in changeset.