HomeController.java

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

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

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

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

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

  1. … 12 more files in changeset.
LDEV-5350 Add grouping preview and group count to Add Lesson dialog

  1. … 3 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

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

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

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

  1. … 19 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-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 59 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

  1. … 181 more files in changeset.
LDEV-5211 Add all course monitors to newly created lessons

This feature only applies to Add Lesson button and Add Single Activity

Lesson feature. If it needs to be applied somewhere else too, additional

implementation is required.

  1. … 1 more file in changeset.
LKC-89 Show TBL monitor as default for TBL sequences

  1. … 2 more files in changeset.
LDEV-5163 Reintroduce code that restarts lesson on each learner entry

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

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

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

  1. … 7 more files in changeset.
Merge branch 'SP-3'

  1. … 7 more files in changeset.
Merge branch 'master' into develop

  1. … 1 more file in changeset.
LDEV-4879 Create lesson in subgroups at one go

  1. … 4 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

  1. … 28 more files in changeset.
SP-3 Automatically redirect to logout URL configured in sysadmin

  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

  1. … 2 more files in changeset.
LDEV-4802 Use redirect instead of forward to Learner interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

  1. … 3 more files in changeset.
LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

  1. … 10 more files in changeset.
LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

  1. … 182 more files in changeset.
LDEV-4440 Central minor fixes

  1. … 29 more files in changeset.
LDEV-4440 Central minor fixes

  1. … 8 more files in changeset.