DisplayGroupAction.java

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

  1. … 14 more files in changeset.
Merge learning outcomes LDEV-4644 into lams31

  1. … 14 more files in changeset.
LDEV-4440 Central *.java migration

  1. … 67 more files in changeset.
LDEV-4644 Add/edit learning outcome

  1. … 13 more files in changeset.
LDEV-4644 Add outcomes in More Options on index page

  1. … 1 more file in changeset.
LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

  1. … 34 more files in changeset.
LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

  1. … 78 more files in changeset.
LDEV-4366 Disable learner's button when Kumalive is not started

  1. … 4 more files in changeset.
LDEV-4447 Toggle Kumalive feature on organisation level

  1. … 7 more files in changeset.
LDEV-4447 Toggle Kumalive feature on sysadmin level

  1. … 6 more files in changeset.
LDEV-4366 Open Kumalive in a pop up window rather than jQuery dialog

  1. … 4 more files in changeset.
LDEV-4366 Add a working version of Kumalive

  1. … 14 more files in changeset.
LDEV-4366 Prototype Kumalive front and back ends

  1. … 18 more files in changeset.
LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart.

  1. … 4 more files in changeset.
LDEV-3962 Use the same icon for all Gradebook buttons

LDEV-3962 * "Enable lesson sorting" - move to the "More options" menu * Remove "Refresh" button

  1. … 6 more files in changeset.
LDEV-3714: Remove archived courses list from the profile tab on the home page.

  1. … 5 more files in changeset.
LDEV-4017: Bootstrap organisation (course) grouping and groups dialogs.

  1. … 9 more files in changeset.
LDEV-3962 * support for favorite orgs and last visited one * if last visited is stored, offcanvas bar is shown as hidden * offcanvas bar is shrank to 220px * CSS rules for main.jsp are all moved to main.css * Javascript methods for main.jsp are moved to main.js. Profile related ones to profile.js. Only methods used by other pages are kept in groupDisplay.js. * removed UserOrganisationCollapsed.java and code associated with it

  1. … 36 more files in changeset.
LDEV-3962 Bootstrap index page

  1. … 34 more files in changeset.
LDEV-3962: implementing the new course bootstrap panel(ish).

  1. … 23 more files in changeset.
LDEV-3824: Replace Eadventure with a stub. Make Authoring process, but hide invalid Tools (needed for LD import).

  1. … 218 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 1074 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 782 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

  1. … 2120 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

  1. … 1860 more files in changeset.
LDEV-3401: Convert XDoclet annotations to empty comments.

  1. … 473 more files in changeset.
LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

  1. … 371 more files in changeset.
LDEV-3549 Course gradebook only to be accessible for course admin/managers

  1. … 1 more file in changeset.
LDEV-3549 Course gradebook only to be accessible for course admin/managers

  1. … 1 more file in changeset.