Fisheye: Diff - lams-github/lams_build/lib/lams/lams.jar

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

920d578

Monthly merge from master to lams31
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

18 May 18 Marcin Cieslak 920d578377db9f50585f754c68a25e72da1d2c2f

Loading ...