Fisheye: changeset 2c03060b238558d183472f0066ba003c76d00fd0

Marcin Cieslak

committed

2c03060

on 26 Aug 17

Merge remote-tracking branch 'origin/master' into lams31
Multiple conflicts resolved with JSON replace and class move to
packages.

552c232 + 2623eb7

v4.7 + v4.8

Options

lams_admin src java org lamsfoundation lams admin web action
- File OrgManageAction.java
- File ToolContentListAction.java
- File UserSearchAction.java
lams_build
- File build_base.xml
- File common.properties
- lib lams
  - File lams.jar
- File liblist.txt
lams_central src java org lamsfoundation lams
- web
  - File HomeAction.java
  - File IndexAction.java
  - File OrganisationGroupAction.java
  - action
    - File LtiAction.java
  - planner
    - File PedagogicalPlannerAction.java
- workspace service
  - File IWorkspaceManagementService.java
  - File WorkspaceManagementService.java
lams_common src java org lamsfoundation lams
- integration service
  - File IntegrationService.java
- learningdesign service
  - File ExportToolContentService.java
lams_learning web WEB-INF
- File web.xml
lams_tool_assessment src java org lamsfoundation lams tool assessment service
- File AssessmentServiceImpl.java
lams_tool_forum src java org lamsfoundation lams tool forum service
- File ForumService.java
lams_tool_lamc src java org lamsfoundation lams tool mc
- service
  - File McService.java
- web action
  - File McLearningAction.java
  - File McMonitoringAction.java
lams_tool_laqa src java org lamsfoundation lams tool qa
- service
  - File QaService.java
- web action
  - File QaLearningAction.java
  - File QaMonitoringAction.java
lams_tool_larsrc src java org lamsfoundation lams tool rsrc service
- File ResourceServiceImpl.java
lams_tool_leader src java org lamsfoundation lams tool leaderselection service
- File LeaderselectionService.java
lams_tool_nb src java org lamsfoundation lams tool noticeboard service
- File NoticeboardService.java
lams_tool_sbmt src java org lamsfoundation lams tool sbmt
- service
  - File SubmitFilesService.java
- web action
  - File MonitoringAction.java
lams_tool_vote src java org lamsfoundation lams tool vote
- service
  - File VoteService.java
- web action
  - File LearningAction.java
  - File MonitoringAction.java
  - File VoteChartGeneratorAction.java