Clone
Marcin Cieslak
committed
on 10 Sep
Merge remote-tracking branch 'origin/master' into lams31
Conflicts:
lams_admin/.classpath
lams_build/lib/lams/lams-central.jar
lams_build… Show more
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

        lams_admin/.classpath

        lams_build/lib/lams/lams-central.jar

        lams_build/lib/lams/lams-gradebook.jar

        lams_build/lib/lams/lams.jar

        lams_central/.classpath

        lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

        lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

        lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

        lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

        lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

        lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

        lams_central/web/includes/javascript/pedagogicalPlanner.js

        lams_common/.classpath

        lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

        lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

        lams_gradebook/.classpath

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

        lams_learning/.classpath

        lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

        lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

        lams_monitoring/.classpath

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

        lams_tool_assessment/.classpath

        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_bbb/.classpath

        lams_tool_chat/.classpath

        lams_tool_doku/.classpath

        lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

        lams_tool_eadventure/.classpath

        lams_tool_forum/.classpath

        lams_tool_images/.classpath

        lams_tool_kaltura/.classpath

        lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

        lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

        lams_tool_lamc/.classpath

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

        lams_tool_laqa/.classpath

        lams_tool_larsrc/.classpath

        lams_tool_leader/.classpath

        lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

        lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

        lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

        lams_tool_nb/.classpath

        lams_tool_notebook/.classpath

        lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

        lams_tool_sbmt/.classpath

        lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

        lams_tool_scratchie/.classpath

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

        lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

        lams_tool_spreadsheet/.classpath

        lams_tool_survey/.classpath

        lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

        lams_tool_task/.classpath

        lams_tool_vote/.classpath

        lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

        lams_tool_wiki/.classpath

Show less