Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Replace BBB and GMap tools with stubs

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

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

Implmented in GMap

  1. … 3 more files in changeset.
LDEV-3793: Bootstrapping monitor

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

  1. … 9 more files in changeset.
LDEV-1730 If Tool is not group do now show the group reference

  1. … 3 more files in changeset.
LDEV-2459 use double quotes when enclosing i18n text in javascript

  1. … 47 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 167 more files in changeset.
Merging 2.3 changes with head

LDEV-2216 Changing handling of markerinfo and marker title to not use the javascript ecape() function as it was screwing up non ASCII (greek) characters

LDEV2232 setting gmap marker gmapSession to null on export content to prevent potential errors on import

  1. … 5 more files in changeset.
LDEV-2014 - Changing the refresh button to not just to a location.reload but instead redirect to the learner/monitor page to prevent duplicate markers

  1. … 2 more files in changeset.
LDEV-1911 Making Gmap tool have its own config page for the gmap API key, istead of putting it in the general lams configuration page.

This is the web stuff to make the config model possible

  1. … 8 more files in changeset.
LDEV-1853 The default geocoder address is now saveable along with the other gmap content, so teachers can decide what info the students start with. This commit fixes the jsp pages to do so

  1. … 5 more files in changeset.
LDEV-1856 Resolved this issue by putting a javascript escape() around the title and info message when the markers are serialised for saving. Then when we redraw them later, the javascript unescape() function is used to put them back to their original form.

  1. … 4 more files in changeset.
LDEV-1850 - Adding reflection to advanced summary in monitor for gmap

  1. … 2 more files in changeset.
LDEV-1850 - Doing reflection for Gmap, Learner, monitor done. Just need to do export portfolio

  1. … 11 more files in changeset.
LDEV-1662 wrong closure of the script tab solved in all tools

  1. … 11 more files in changeset.
For LDEV-1850

Adding in reflection, finished for learner and author.

Monitor and export portfolio still unfinished

  1. … 21 more files in changeset.
For LDEV-1851

Adding the saveMarkers action to monitor so the teacher can save/update/remove markers

  1. … 5 more files in changeset.
Added refresh button to monitor and learner interfaces

  1. … 4 more files in changeset.
LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

Gmap

  1. … 1 more file in changeset.
Some changes to ensure that maps display properly in IE 6 and IE 7

  1. … 3 more files in changeset.
LDEV-1845 adding a map legend to the map interface

  1. … 6 more files in changeset.
Fixing up map/sidebar divs using the float:left/right style

  1. … 1 more file in changeset.
Added onkeypress (enter) evecnt catches to prevent the form from submitting when someone presses enter either editing a marker or using the geocoder

  1. … 3 more files in changeset.
Added changes in to implement code and interfaces for grouping, this was previously un-implemented n monitor and learner

  1. … 34 more files in changeset.
Optimising javascript in view pages

  1. … 3 more files in changeset.
learner and monitor draft versions are done

  1. … 14 more files in changeset.
First commit for the gmap tool

Got the gmaps appearing in author, you can add multiple markers and descriptions for the markers, but you cannot save yet.

Draft data model also completed

  1. … 143 more files in changeset.