Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-3805 Reflections are paged.

  1. … 9 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

  1. … 2 more files in changeset.
LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

  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-4067: changing google maps URL to be on https rather than http

  1. … 1 more file in changeset.
LDEV-4067: changing google maps URL to be on https rather than http

  1. … 1 more file in changeset.
LDEV-3436: Refactoring Save/Finish button code

LDEV-3436: Consistent Save/Finish Buttons Gmap tool

LDEV-3923: Updating gmap learner screens to suit sliding div based progress bar.

  1. … 1 more file in changeset.
LDEV-3850: Grouping options in the advanced tag, updating tags from core.

  1. … 8 more files in changeset.
LDEV-3826: Bootstrapping Admin

  1. … 2 more files in changeset.
LDEV-3798: Update GMap Admin screen to Bootstrap

LDEV-3793: Bootstrapping monitor

    • -0
    • +167
    ./monitoring/advancedOptions.jsp
  1. … 1 more file in changeset.
LDEV-3792: Bootstrapping GMap Author

  1. … 21 more files in changeset.
LDEV-3699: Tweaking formatting

LDEV-3699: Tweaking formatting

LDEV-3699: Tweaking formatting

LDEV-3699: Tweaking formatting

  1. … 1 more file in changeset.
LDEV-3699: Update Gmap Learner to Bootstrap

LDEV-3699: Update Gmap Learner to Bootstrap

    • -35
    • +38
    ./learning/parts/finishButton.jsp
  1. … 6 more files in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 338 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-2917: Use <!DOCTYPE html> everywhere.

  1. … 170 more files in changeset.
LDEV-3211: Fix reflections formatting in learner

  1. … 5 more files in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 2 more files in changeset.
LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

  1. … 130 more files in changeset.
LDEV-3084: If Google Maps API was not loaded, mark browser as incompatible, resulting in "Could not load map" message, better than error while loading page.

  1. … 1 more file in changeset.
LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they are last in LD.

  1. … 180 more files in changeset.
LDEV-2974 all tools should contain identical LAMS tags in order to make calling ANT target copy-tags painless

  1. … 3 more files in changeset.