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

    • -39
    • +36
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +2
    ./lamsfoundation/lams/web/IndexController.java
  1. … 8 more files in changeset.
LDEV-5354 Move course URL copy button to More Options menu

    • -44
    • +35
    ./lamsfoundation/lams/web/DisplayGroupController.java
  1. … 4 more files in changeset.
LDEV-5354 Add course URL on index page

    • -0
    • +6
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +2
    ./lamsfoundation/lams/web/IndexController.java
    • -7
    • +17
    ./lamsfoundation/lams/web/LaunchLearnerUrlServlet.java
  1. … 6 more files in changeset.
LDEV-5354 Rename encoding methods so they can incorporate course ID

    • -1
    • +1
    ./lamsfoundation/lams/web/LaunchLearnerUrlServlet.java
  1. … 2 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

    • -0
    • +11
    ./lamsfoundation/lams/web/HomeController.java
  1. … 11 more files in changeset.
LDEV-5350 Add grouping preview and group count to Add Lesson dialog

    • -1
    • +6
    ./lamsfoundation/lams/web/HomeController.java
  1. … 3 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

    • -0
    • +6
    ./lamsfoundation/lams/web/HomeController.java
    • -20
    • +3
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 9 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

  1. … 6 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.

    • -14
    • +8
    ./lamsfoundation/lams/web/OrganisationGroupController.java
    • -5
    • +7
    ./lamsfoundation/lams/web/OrganisationGroupServlet.java
  1. … 5 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/orgGrouping.js

  1. … 2 more files in changeset.
LDEV-3120 Use only subcourse learners when applying course grouping

    • -5
    • +12
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 2 more files in changeset.
SP-4 Remove users from subcourses which are not present in input file

SP-4 Rewrite user (un)enrolment

Previous code was not taking account edge situations and course manager

implications.

  1. … 1 more file in changeset.
SP-4 Fix user disabling after manager role removal

SP-4 Fix roles processing

There was a problem when removing a user from an organisation.

Managers were also incorrectly processed.

Also a rewrite of user data gathering and user accounts creation logic.

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

    • -1
    • +2
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -4
    • +6
    ./lamsfoundation/lams/web/IndexController.java
    • -1
    • +1
    ./lamsfoundation/lams/web/PortraitSaveController.java
  1. … 20 more files in changeset.
LDEV-5302 Fix access rights for appadmin

    • -1
    • +2
    ./lamsfoundation/lams/web/IndexController.java
  1. … 1 more file in changeset.
LDEV-5338 Rename file to reflect its purpose better

  1. … 2 more files in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 7 more files in changeset.
LDEV-5338 Rename class to reflect its purpose better

    • -0
    • +632
    ./lamsfoundation/lams/web/GroupingController.java
    • -632
    • +0
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 5 more files 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

    • -2
    • +1
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -2
    • +2
    ./lamsfoundation/lams/web/HomeController.java
    • -4
    • +4
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 29 more files in changeset.
LDEV-5341 Fix misleading alerts for standard role checks

  1. … 1 more file in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

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

    • -2
    • +1
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -2
    • +2
    ./lamsfoundation/lams/web/FindUserLessonsController.java
    • -2
    • +2
    ./lamsfoundation/lams/web/HomeController.java
    • -4
    • +4
    ./lamsfoundation/lams/web/LessonConditionsController.java
    • -4
    • +4
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 25 more files in changeset.
LDEV-5340 Return correct MIME type

LDEV-5340 Return correct MIME type

LDEV-5340 Allow video embedding from custom sites

    • -0
    • +141
    ./lamsfoundation/lams/web/controller/EditorEmbedProxyController.java
  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/ExtServerManagementController.java

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

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.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/integration/ltiConsumerList.jsp

lams_admin/web/signupmanagement/list.jsp

  1. … 16 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -0
    • +1
    ./lamsfoundation/lams/web/HomeController.java
    • -1
    • +9
    ./lamsfoundation/lams/web/OrganisationGroupController.java
  1. … 18 more files in changeset.
LDEV-5335 Log adjustments and fixes

  1. … 8 more files in changeset.