Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5436 Use comma as name separator

Also fix names in few other places.

  1. … 8 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

  1. … 86 more files in changeset.
LDEV-5426 Use only supported time zones

  1. … 7 more files in changeset.
LDEV-5440 Revert some unnecessary package name changes

  1. … 462 more files in changeset.
LDEV-5440 Refactor packages of imported classes

  1. … 480 more files in changeset.
LDEV-5440 Rewrite config files and library references

  1. … 953 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5436 Add project-wide User sorting on Java level

  1. … 10 more files in changeset.
LDEV-5435 Add email in login column in course user view

  1. … 2 more files in changeset.
LDEV-5426 Switch from custom time zones to built-in Java ones

  1. … 40 more files in changeset.
LDEV-5302 Fix admin role detection when editing a course

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

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 10 more files in changeset.
SP-4 Make sure that roles in subcourse are propagated to parent course.

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

SP-4 Skip event log when disabling users via batch enrolment processing

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

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

  1. … 8 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

  1. … 56 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

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

SP-4 Check if user has any roles on SQL and not Java level

  1. … 1 more file in changeset.
SP-4 Check if user has any roles on SQL and not Java level

Conflicts:

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

  1. … 1 more file in changeset.
LDEV-5302 Do not shows sysadmin role in course role assignment

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

Conflicts:

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

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 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.
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.
LDEB-5335 Add structured audit logs on various admin actions

  1. … 22 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. … 57 more files in changeset.
LDEV-5321 Prevent non-sysadmins from editing sysadmins

  1. … 1 more file in changeset.
Revert "LDEV-5320 Give more details about course roles being added and removed"

This reverts commit bd5afdb894181e618bc5871783f7c621bbb1453f.

  1. … 1 more file in changeset.