Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Central *.java migration

  1. … 67 more files in changeset.
Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

  1. … 83 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 34 more files in changeset.
LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

  1. … 57 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-3805 Reflections are paged.

  1. … 6 more files in changeset.
LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

  1. … 28 more files in changeset.
LDEV-4286 Show Authoring advanced tab on re-editing content from monitor

  1. … 21 more files in changeset.
LDEV-4300 Audit logs when activity is modified in monitor

  1. … 86 more files in changeset.
LDEV-4291 Move getAccessMode method to WebUtil

  1. … 30 more files in changeset.
LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

  1. … 223 more files in changeset.
LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

  1. … 37 more files in changeset.
LDEV-3952: updating scripts to be compatible with MySQL 5.7

  1. … 43 more files in changeset.
LDEV-3750 Improve performance of pushing marks to gradebook

  1. … 36 more files in changeset.
LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

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

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

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

    • -237
    • +238
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -520
    • +512
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
  1. … 2106 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

    • -237
    • +238
    ./org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -520
    • +512
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
  1. … 1846 more files in changeset.
LDEV-3401: Convert XDoclet annotations to empty comments.

    • -33
    • +33
    ./org/lamsfoundation/lams/tool/gmap/model/Gmap.java
  1. … 460 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-3556: Remove LAMS 1 methods for importing Tool content.

  1. … 27 more files in changeset.
LDEV-3640: Generate only a warning when there is no foreign key to drop.

  1. … 28 more files in changeset.
LDEV-3638: Remove lesson and all its resources on demand. Files in content repository stay. Clean up unnecessary code, format.

  1. … 47 more files in changeset.
LDEV-3640: Add cascades in tool tables.

  1. … 28 more files in changeset.
LDEV-3638: Remove lesson and all its resources on demand. Files in content repository stay. Clean up unnecessary code, format.

  1. … 48 more files in changeset.
LDEV-3640: Add cascades in tool tables.

  1. … 27 more files in changeset.
LDEV-3633: Allow specyfing port which MySQL runs on. Disable SSL for building LAMS as it generates a warning message. New MySQL does not accept ALTER IGNORE TABLE statements.

  1. … 24 more files in changeset.
LDEV-3564 session id must be unique in tool's session table

  1. … 19 more files in changeset.
LDEV-3564 session id must be unique in tool's session table

  1. … 21 more files in changeset.