DisplayGroupController.java

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Revert some unnecessary package name changes

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

  1. … 955 more files in changeset.
SP-9 Add access control

  1. … 1 more file in changeset.
SP-9 Add learner view

  1. … 3 more files in changeset.
SP-9 Add course teamwork table

  1. … 1 more file in changeset.
SP-9 Add basic classes and entry point on index page

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

  1. … 9 more files in changeset.
LDEV-5354 Move course URL copy button to More Options menu

  1. … 4 more files in changeset.
LDEV-5354 Add course URL on index page

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

  1. … 24 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-5329 Remove obsolete configuration items

  1. … 13 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-5083 Use correct icon for monitoring

LDEV-5083 Remove link to old monitoring UI

It was broken anyway

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

  1. … 2 more files in changeset.
LDEV-4366 Fix Kumalive role detection

  1. … 1 more file in changeset.
LDEV-5083 Allow displaying both old and new monitoring UIs

  1. … 1 more file in changeset.
LDEV-5083 Open monitoring UI on full page, not in dialog

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

  1. … 181 more files in changeset.
LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

  1. … 19 more files in changeset.
LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

  1. … 5 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

    • -18
    • +123
    ./DisplayGroupController.java
  1. … 198 more files in changeset.
LDEV-4918 Collapsible subcourses

  1. … 13 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 94 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 43 more files in changeset.
LDEV-4776 Let monitors see course gradebook for their lessons

Group manager sees all lessons in a course. Monitor sees only ones he is

a monitor in.

  1. … 6 more files in changeset.
LDEV-4705 Remove references to Group Admin role from Java code

  1. … 26 more files in changeset.