lams-github / lams_central / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 05 Oct 2018
5:58 pm

Andrey Balan

LDEV-4440 Fix comments feature

Options
    • -31
    • +33
    ./lamsfoundation/lams/comments/web/CommentController.java
  2. … 36 more files in changeset.
Thursday 04 Oct 2018
7:40 pm

Andrey Balan

Merge branch 'LDEV-4440' of https://github.com/lamsfoundation/lams into LDEV-4440

Options
    • -3
    • +5
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -0
    • +1
    ./lamsfoundation/lams/workspace/web/WorkspaceController.java
7:35 pm

Andrey Balan

LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

Options
    • -12
    • +4
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -8
    • +0
    ./lamsfoundation/lams/authoring/web/AuthoringController.java
    • -5
    • +1
    ./lamsfoundation/lams/authoring/web/ImportToolContentController.java
    • -10
    • +5
    ./lamsfoundation/lams/comments/web/CommentController.java
    • -12
    • +6
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -3
    • +1
    ./lamsfoundation/lams/web/EmailUserController.java
    • -9
    • +0
    ./lamsfoundation/lams/web/FindUserLessonsController.java
    • -7
    • +0
    ./lamsfoundation/lams/web/HomeController.java
    • -6
    • +1
    ./lamsfoundation/lams/web/IndexController.java
    • -2
    • +2
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -9
    • +2
    ./lamsfoundation/lams/web/LessonConditionsController.java
    • -20
    • +15
    ./lamsfoundation/lams/web/LoginAsController.java
    • -4
    • +0
    ./lamsfoundation/lams/web/NotificationController.java
    • -9
    • +2
    ./lamsfoundation/lams/web/OrganisationGroupController.java
    • -12
    • +8
    ./lamsfoundation/lams/web/PasswordChangeController.java
  16. … 168 more files in changeset.
6:03 pm

Marcin Cieslak

LDEV-4440 Add necessary qualifiers for service injection

Options
    • -3
    • +6
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./lamsfoundation/lams/workspace/web/WorkspaceController.java
Wednesday 03 Oct 2018
4:26 am

Andrey Balan

LDEV-4440 Remove reference to the deleted AuthoringConstants

Options
    • -2
    • +0
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
Tuesday 02 Oct 2018
10:14 pm

Andrey Balan

LDEV-4440 Switch servlets to using autowired service beans

Besides, RegisterAction was renamed to RegisterServlet. And one

remaining constant was moved from AuthoringConstants to CentralConstants

with subsequent removal of AuthoringConstants.java.

Options
    • -36
    • +0
    ./lamsfoundation/lams/authoring/web/AuthoringConstants.java
    • -1
    • +1
    ./lamsfoundation/lams/rest/LearningDesignRestServlet.java
    • -58
    • +29
    ./lamsfoundation/lams/rest/RestServlet.java
    • -3
    • +3
    ./lamsfoundation/lams/rest/ToolContentRestServlet.java
    • -0
    • +2
    ./lamsfoundation/lams/util/CentralConstants.java
    • -27
    • +33
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -25
    • +18
    ./lamsfoundation/lams/web/GradebookServlet.java
    • -7
    • +16
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -9
    • +14
    ./lamsfoundation/lams/web/LAMSUploadServlet.java
    • -8
    • +2
    ./lamsfoundation/lams/web/LamsStartupServlet.java
    • -15
    • +15
    ./lamsfoundation/lams/web/LaunchLearnerUrlServlet.java
    • -10
    • +20
    ./lamsfoundation/lams/web/LessonOrderServlet.java
    • -23
    • +17
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -14
    • +19
    ./lamsfoundation/lams/web/LoginRequestServlet.java
    • -91
    • +81
    ./lamsfoundation/lams/web/OrganisationGroupServlet.java
  16. … 15 more files in changeset.
6:39 am

Andrey Balan

LDEV-4440 Fix Spring MVC related issues with signup pages

Options
    • -29
    • +22
    ./lamsfoundation/lams/web/controller/SignupController.java
  2. … 10 more files in changeset.
Friday 28 Sep 2018
8:50 pm

Marcin Cieslak

LDEV-4440 Use forwards instead of redirects to keep Struts behaviour

Options
    • -8
    • +8
    ./lamsfoundation/lams/web/IndexController.java
    • -1
    • +1
    ./lamsfoundation/lams/web/LoginAsController.java
    • -6
    • +3
    ./lamsfoundation/lams/web/PortraitSaveController.java
  4. … 8 more files in changeset.
7:10 pm

Marcin Cieslak

LDEV-4440, LDEV-3676 Fix HTML tags stripping after reload

Options
    • -3
    • +3
    ./lamsfoundation/lams/web/ProfileSaveController.java
  2. … 1 more file in changeset.
Thursday 27 Sep 2018
10:25 pm

Andrey Balan

LDEV-4440 Fix redirectURL after changing password

Options
    • -7
    • +14
    ./lamsfoundation/lams/web/IndexController.java
  2. … 1 more file in changeset.
10:08 pm

Marcin Cieslak

LDEV-4135 Identified parallel activity children with tool signatures

Identification with description words sometimes fails.

Options
    • -2
    • +3
    ./lamsfoundation/lams/authoring/web/AuthoringController.java
  2. … 5 more files in changeset.
7:06 pm

Marcin Cieslak

LDEV-4440 Fix profile editing validation and save

Options
    • -1
    • +1
    ./lamsfoundation/lams/web/IndexController.java
    • -8
    • +5
    ./lamsfoundation/lams/web/ProfileSaveController.java
  3. … 1 more file in changeset.
2:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Error tag to standardise error message layout

Options
    • -3
    • +1
    ./lamsfoundation/lams/web/PasswordChangeController.java
  2. … 10 more files in changeset.
Sunday 23 Sep 2018
6:27 pm

Marcin Cieslak

LDEV-4440 Adjust lams:textarea tag to support "disabled" attribute

Options
    • -14
    • +22
    ./lamsfoundation/lams/web/tag/LAMSMultiLinesTextareaTag.java
  2. … 34 more files in changeset.
Saturday 22 Sep 2018
4:56 pm

Marcin Cieslak

LDEV-4440 Always get idle timeout from current configuration cache

Options
    • -6
    • +1
    ./lamsfoundation/lams/web/SessionListener.java
1:32 am

Andrey Balan

LDEV-4440 Merge FileValidatorSpringUtil and FileValidatorUtil into FileValidatorUtil

Options
    • -2
    • +2
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -2
    • +2
    ./lamsfoundation/lams/web/LAMSUploadServlet.java
  3. … 21 more files in changeset.
Friday 21 Sep 2018
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Options
    • -9
    • +9
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +2
    ./lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 28 more files in changeset.
Wednesday 19 Sep 2018
12:39 am

Marcin Cieslak

LDEV-4440 Fix paths to JSP pages for profile controller

Options
    • -1
    • +1
    ./lamsfoundation/lams/web/PortraitController.java
    • -5
    • +5
    ./lamsfoundation/lams/web/ProfileController.java
Tuesday 18 Sep 2018
3:46 pm

Marcin Cieslak

Merge remote-tracking branch 'andrey/LDEV-4440' into LDEV-4440

Options
    • -11
    • +12
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
  2. … 3 more files in changeset.
8:41 am

Andrey Balan

LDEV-4440 Stop using deprecated DiskFileUpload

Use ServletFileUpload together with DiskFileItemFactory instead.

Options
    • -11
    • +12
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -25
    • +26
    ./lamsfoundation/lams/web/LAMSUploadServlet.java
    • -17
    • +21
    ./lamsfoundation/lams/web/QuestionsController.java
  4. … 2 more files in changeset.
2:48 am

Marcin Cieslak

LDEV-4440 Fix JSON result in learning outcomes controller

Options
    • -18
    • +19
    ./lamsfoundation/lams/web/outcome/OutcomeController.java
Saturday 15 Sep 2018
1:22 pm

Marcin Cieslak

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

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/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

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

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

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

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

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

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

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/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

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

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

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

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

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

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

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

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

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

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

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

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

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

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

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

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

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/ClearSessionAction.java

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

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

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

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

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

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

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

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/ClearSessionAction.java

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

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

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

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

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

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

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

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

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

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

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

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

Options
    • -21
    • +19
    ./lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +1
    ./lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -278
    • +46
    ./lamsfoundation/lams/authoring/service/AuthoringService.java
    • -78
    • +60
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -11
    • +21
    ./lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -6
    • +0
    ./lamsfoundation/lams/authoring/web/AuthoringConstants.java
    • -6
    • +10
    ./lamsfoundation/lams/authoring/web/AuthoringController.java
    • -63
    • +21
    ./lamsfoundation/lams/authoring/web/ImportToolContentController.java
    • -6
    • +6
    ./lamsfoundation/lams/rest/RestServlet.java
    • -34
    • +1
    ./lamsfoundation/lams/util/CentralConstants.java
    • -6
    • +6
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -4
    • +3
    ./lamsfoundation/lams/web/GradebookServlet.java
    • -6
    • +12
    ./lamsfoundation/lams/web/IndexController.java
    • -2
    • +3
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -4
    • +4
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
  16. … 634 more files in changeset.
Monday 10 Sep 2018
2:36 am

Marcin Cieslak

LDEV-4649 Fix outcome/scale export file extension

Options
    • -2
    • +2
    ./lamsfoundation/lams/web/outcome/OutcomeAction.java
2:10 am

Marcin Cieslak

Merge learning outcomes LDEV-4644 into lams31

Options
    • -6
    • +18
    ./lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +6
    ./lamsfoundation/lams/web/DisplayGroupAction.java
  3. … 13 more files in changeset.
1:55 am

Marcin Cieslak

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

Options
    • -21
    • +19
    ./lamsfoundation/lams/authoring/ObjectExtractor.java
    • -272
    • +28
    ./lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +142
    ./lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -19
    • +24
    ./lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -6
    • +16
    ./lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -17
    • +22
    ./lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -6
    • +6
    ./lamsfoundation/lams/rest/RestServlet.java
    • -6
    • +4
    ./lamsfoundation/lams/web/IndexAction.java
    • -9
    • +10
    ./lamsfoundation/lams/web/OrganisationGroupAction.java
    • -3
    • +6
    ./lamsfoundation/lams/web/action/LtiAction.java
    • -3
    • +3
    ./lamsfoundation/lams/webservice/RegisterAction.java
    • -18
    • +9
    ./lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  13. … 92 more files in changeset.
Friday 31 Aug 2018
6:08 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning branching fixes

Options
    • -22
    • +4
    ./lamsfoundation/lams/authoring/web/ExportToolContentController.java
  2. … 2 more files in changeset.
5:19 pm

Marcin Cieslak

LDEV-4440 Various fixes in admin

Options
    • -1
    • +2
    ./lamsfoundation/lams/web/LoginAsController.java
  2. … 7 more files in changeset.
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 EXportContetContrller

Options
    • -1
    • +1
    ./lamsfoundation/lams/authoring/web/ExportToolContentController.java
5:13 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Portrait fix

Options
    • -32
    • +34
    ./lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./lamsfoundation/lams/authoring/web/ExportToolContentController.java
  3. … 7 more files in changeset.
11:23 am

Marcin Cieslak

LDEV-4649 Outcome import

Options
    • -1
    • +21
    ./lamsfoundation/lams/web/outcome/OutcomeAction.java
  2. … 4 more files in changeset.