Fisheye: Diff - lams-github/lams_tool

Tree
Options

1b036cb

Monthly merge from master to lams31
Conflicts:
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java
lams_tool_mindmap/.classpath
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

24 Jun 18 Marcin Cieslak 1b036cb2e23c7358b8b44b47c4a131853d2075d1

0e594c4

LDEV-4588 Websockets replace polling for multiuser mode

30 May 18 Fiona Malikoff <Fiona.Malikoff@gmail.com> 0e594c4a472245d5f4fc8b4978d20a1e7c99867b

Loading ...