lams-github

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

Show less