Fisheye on lams-github/lams_build/lib/lams

lams-github (v4.7): LDEV-4683 Ensure new learning designs have a unique name within folder

Mon, 08 Oct 2018 04:38:29 +0200

Fiona Malikoff committed 1de0a20 on branch v4.7, v4.8 in lams-github

LDEV-4683 Ensure new learning designs have a unique name within folder

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-44, +13)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(-4, +3)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/authoring/IAuthoringService.java	(-13, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(-79, +33)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(-0, +17)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(-0, +48)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Fix Spring MVC related issues with signup pages

Andrey Balan — Tue, 02 Oct 2018 00:39:42 +0200

Andrey Balan committed e952488 on branch v4.7, v4.8 in lams-github

LDEV-4440 Fix Spring MVC related issues with signup pages

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(-29, +22)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/urlrewrite.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/signup/loginTab.jsp	(-4, +7)	\| History	\| Source	\| Diff
· /lams_central/web/signup/signup.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/signup/singupTab.jsp	(-5, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/dao/ISignupDAO.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/ISignupService.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(-2, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4135 Identified parallel activity children with tool signatures...

Marcin Cieslak — Thu, 27 Sep 2018 16:08:07 +0200

Marcin Cieslak committed 671c012 on branch v4.7, v4.8 in lams-github

LDEV-4135 Identified parallel activity children with tool signatures

Identification with description words sometimes fails.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(-2, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(-2, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(-18, +43)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4664 Tweak HTTP connection access

Marcin Cieslak — Tue, 25 Sep 2018 05:08:18 +0200

Marcin Cieslak committed 8b8155c on branch v4.7, v4.8 in lams-github

LDEV-4664 Tweak HTTP connection access

· /lams_build/build_base.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java	(-4, +2)	\| History	\| Source	\| Diff
· /lams_tool_zoom/.classpath	(-1, +6)	\| History	\| Source	\| Diff
· /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java	(-6, +7)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Get rid of obsolete token processing

Marcin Cieslak — Sat, 22 Sep 2018 10:34:37 +0200

Marcin Cieslak committed ce8ce53 on branch v4.7, v4.8 in lams-github

LDEV-4440 Get rid of obsolete token processing

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/util/TokenProcessor.java	(-287, +0)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java	(-8, +0)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java	(-3, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Fix chosen grouping

Marcin Cieslak — Sat, 22 Sep 2018 10:13:17 +0200

Marcin Cieslak committed cb2cfe5 on branch v4.7, v4.8 in lams-github

LDEV-4440 Fix chosen grouping

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/orgGroup.jsp	(-13, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/FileUploadForm.java	(-6, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java	(-1, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(-15, +13)	\| History	\| Source	\| Diff

lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration...

Marcin Cieslak — Sat, 15 Sep 2018 07:22:02 +0200

Marcin Cieslak committed 62aaf16 on branch v4.7, v4.8 in lams-github

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

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +54)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

(-2, +47)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +48)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

(-7, +53)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml

(-1, +4)

| History

| Source

| Diff

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

(-51, +38)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java

(-8, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java

(-4, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java

(-43, +7)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

(-12, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java

(-0, +264)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-2, +7)

| History

| Source

| Diff

… 634 more files in changeset.

lams-github (v4.7): LDEV-4661 Move dependency to lams.jar

Marcin Cieslak — Wed, 12 Sep 2018 14:29:41 +0200

Marcin Cieslak committed 9bb6158 on branch v4.7, v4.8 in lams-github

LDEV-4661 Move dependency to lams.jar

· /lams_build/build.xml	(-13, +0)	\| History	\| Source	\| Diff
· /lams_build/build_base.xml	(-475, +475)	\| History	\| Source	\| Diff
· /lams_build/build_tools_base.xml	(-6, +0)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/build.xml	(-61, +63)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge learning outcomes LDEV-4644 into lams31

Marcin Cieslak — Sun, 09 Sep 2018 20:10:25 +0200

Marcin Cieslak committed ab8e7f3 on branch v4.7, v4.8 in lams-github

Merge learning outcomes LDEV-4644 into lams31

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-0, +6)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +43)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-6, +18)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/struts-config.xml	(-1, +30)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-1, +28)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-8, +108)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/outcome.css	(-27, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/outcome.scss	(-45, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge remote-tracking branch 'origin/master' into lams31...

Marcin Cieslak — Sun, 09 Sep 2018 19:55:53 +0200

Marcin Cieslak committed 344a785 on branch v4.7, v4.8 in lams-github

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

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

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

(-7, +3)

| History

| Source

| Diff

· /lams_build/conf/standalone.xml

(-1, +1)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/.classpath

(-4, +0)

| History

| Source

| Diff

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

(-21, +19)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-272, +28)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java

(-0, +142)

| History

| Source

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

(-19, +24)

| History

| Source

| Diff

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

(-6, +16)

| History

| Source

| Diff

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

(-17, +22)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +4)

| History

| Source

| Diff

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

(-9, +10)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

… 89 more files in changeset.

lams-github (v4.7): LDEV-4440 Portrait fix

Fri, 31 Aug 2018 11:13:21 +0200

MichalKowalski committed 0098ee9 on branch v4.7, v4.8 in lams-github

LDEV-4440 Portrait fix

· /lams_build/lib/lams/lams-central.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(-32, +34)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/authoring/template/comms.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-8, +8)	\| History	\| Source	\| Diff
· /lams_central/web/portrait.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4649 Outcome import

Marcin Cieslak — Fri, 31 Aug 2018 05:23:09 +0200

Marcin Cieslak committed 39b3310 on branch v4.7, v4.8 in lams-github

LDEV-4649 Outcome import

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java	(-1, +21)	\| History	\| Source	\| Diff
· /lams_central/web/outcome/outcomeManage.jsp	(-8, +28)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(-0, +60)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 added session scope at UserOrgRole, fixed paths - added lams url

Fri, 31 Aug 2018 00:02:29 +0200

Joanna Mielczarek committed 7525e7b on branch v4.7, v4.8 in lams-github

LDEV-4440 added session scope at UserOrgRole, fixed paths - added lams url

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java

(-2, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-3, +3)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java

(-2, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

(-4, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java

(-0, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/lti/ltiConsumerList.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneResult.jsp

(-4, +4)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.7): LDEV-4440 LAMS Central learning link fixed

Thu, 30 Aug 2018 15:29:02 +0200

MichalKowalski committed 6107b0b on branch v4.7, v4.8 in lams-github

LDEV-4440 LAMS Central learning link fixed

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/spring-servlet.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/comms.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/list.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/forgotPassword.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/forgotPasswordChange.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-8, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringMenu.js

(-4, +3)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/orgGroup.js

(-16, +9)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/pedagogicalPlanner.js

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-2, +1)

| History

| Source

| Diff

… 13 more files in changeset.

lams-github (v4.7): LDEV-4440 Missing library

Thu, 30 Aug 2018 12:31:33 +0200

MichalKowalski committed 4f31d48 on branch v4.7, v4.8 in lams-github

LDEV-4440 Missing library

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4440 Central minor fixes

Thu, 30 Aug 2018 11:16:15 +0200

MichalKowalski committed a127989 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central minor fixes

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java

(-2, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java

(-9, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java

(-12, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java

(-7, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

(-6, +14)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerController.java

(-9, +7)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesTextareaTag.java

(-191, +0)

| History

| Source

| Diff

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

(-849, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tiles-defs.xml

(-48, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/lams/lams.tld

(-185, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/struts/struts-bean-el.tld

(-212, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/struts/struts-bean.tld

(-382, +0)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-4440 Central minor fixes

Wed, 29 Aug 2018 15:45:38 +0200

MichalKowalski committed b7aef11 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central minor fixes

· /lams_build/lib/lams/lams-central.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/.classpath	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(-2, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-6, +6)	\| History	\| Source	\| Diff
· /lams_central/web/indexLessonConditions.jsp	(-7, +5)	\| History	\| Source	\| Diff
· /lams_central/web/lessonIntro.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/profile.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/twoFactorAuthSecret.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Central migration

Wed, 29 Aug 2018 10:30:21 +0200

MichalKowalski committed 52f09d3 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central migration

· /lams_build/lib/lams/lams-central.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/portrait.jsp	(-8, +8)	\| History	\| Source	\| Diff
· /lams_central/web/profile.jsp	(-4, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Central migration

Tue, 28 Aug 2018 16:37:06 +0200

MichalKowalski committed 0e9eca8 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central migration

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_central/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-40, +49)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java

(-0, +48)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

(-6, +6)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java

(-10, +10)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java

(-2, +6)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java

(-4, +9)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java

(-9, +13)

| History

| Source

| Diff

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

(-0, +2)

| History

| Source

| Diff

… 38 more files in changeset.

lams-github (v4.7): Merge branch 'LDEV-4407'

Andrey Balan — Tue, 28 Aug 2018 14:46:42 +0200

Andrey Balan committed 7e7ebca on branch v4.7, v4.8 in lams-github

Merge branch 'LDEV-4407'

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-33, +41)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	(-13, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4407 Other projects stop depending on lams_contentrepository

Andrey Balan — Tue, 28 Aug 2018 14:39:56 +0200

Andrey Balan committed e2ab994 on branch v4.7, v4.8 in lams-github

LDEV-4407 Other projects stop depending on lams_contentrepository

· /lams_build/lib/lams/lams-contentrepository.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/util/CentralToolContentHandler.java

(-77, +0)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml

(-3, +6)

| History

| Source

| Diff

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

(-10, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-1, +0)

| History

| Source

| Diff

· /lams_common/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml

(-2, +5)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../tool/assessment/util/AssessmentToolContentHandler.java

(-78, +0)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml

(-4, +7)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbToolContentHandler.java

(-77, +0)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

(-4, +7)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatToolContentHandler.java

(-79, +0)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml

(-3, +6)

| History

| Source

| Diff

… 61 more files in changeset.

lams-github (v4.7): LDEV-4649 Outcome export

Marcin Cieslak — Tue, 28 Aug 2018 13:01:35 +0200

Marcin Cieslak committed 3e663c2 on branch v4.7, v4.8 in lams-github

LDEV-4649 Outcome export

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java	(-0, +26)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/outcome.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/outcome/outcomeManage.jsp	(-0, +10)	\| History	\| Source	\| Diff
· /lams_central/web/outcome/scaleManage.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(-0, +27)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Central war

Mon, 27 Aug 2018 16:05:57 +0200

MichalKowalski committed 5943e05 on branch v4.7, v4.8 in lams-github

LDEV-4440 Central war

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/AuthoringButton.tag

(-5, +5)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag

(-31, +31)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/CommentsAuthor.tag

(-8, +8)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-3, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Rating.tag

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/StyledRating.tag

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/TabBody.tag

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/TabBodyArea.tag

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/TextSearch.tag

(-52, +39)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/comms.jsp

(-10, +10)

| History

| Source

| Diff

… 36 more files in changeset.

lams-github (v4.7): LDEV-4407 Other projects stop depending on lams_central

Andrey Balan — Sat, 25 Aug 2018 13:26:59 +0200

Andrey Balan committed 8236da6 on branch v4.7, v4.8 in lams-github

LDEV-4407 Other projects stop depending on lams_central

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_common/.classpath

(-2, +1)

| History

| Source

| Diff

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

(-12, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java

(-0, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java

(-15, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionExporter.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

(-0, +24)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java

(-2, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/CircularByteBuffer.java

(-1, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/action/LamsAuthoringFinishAction.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/form/TextSearchActionForm.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

(-5, +5)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java

(-1, +1)

| History

| Source

| Diff

… 95 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning noStruts library working

Thu, 23 Aug 2018 12:49:05 +0200

MichalKowalski committed 2bb9777 on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning noStruts library working

· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	(-4, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Migration of admin

Wed, 22 Aug 2018 19:37:10 +0200

Joanna Mielczarek committed c1cd3b5 on branch v4.7, v4.8 in lams-github

LDEV-4440 Migration of admin

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java

(-5, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java

(-2, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java

(-2, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.java

(-3, +3)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java

(-0, +5)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java

(-12, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java

(-16, +13)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java

(-2, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportGroupsForm.java

(-0, +20)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-3, +2)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning noStruts

Wed, 22 Aug 2018 16:17:32 +0200

MichalKowalski committed 7e05bfe on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning noStruts

· /lams_build/lib/lams/lams-learning.jar

(binary)

| History

| Source

| Diff

· /lams_learning/.classpath

(-1, +1)

| History

| Source

| Diff

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

(-332, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java

(-0, +331)

| History

| Source

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

(-5, +4)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java

(-4, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java

(-1, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/servlet/RepopulateProgressMarksServlet.java

(-2, +3)

| History

| Source

| Diff

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

(-10, +8)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java

(-3, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/util/ParallelActivityMappingStrategy.java

(-2, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/struts-config.xml

(-415, +0)

| History

| Source

| Diff

… 13 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning notebook

Wed, 22 Aug 2018 11:34:59 +0200

MichalKowalski committed 8f4be61 on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning notebook

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/view.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewall.jsp	(-6, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewalljournals.jsp	(-2, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'LDEV-4645'

Marcin Cieslak — Tue, 21 Aug 2018 17:12:30 +0200

Marcin Cieslak committed d9e2ff2 on branch v4.7, v4.8 in lams-github

Merge branch 'LDEV-4645'

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4440 Grouping fixes

Tue, 21 Aug 2018 14:44:33 +0200

MichalKowalski committed 580d890 on branch v4.7, v4.8 in lams-github

LDEV-4440 Grouping fixes

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql	(-0, +59)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(-6, +7)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/groupWaitLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/addnew.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/notebook/viewall.jsp	(-2, +2)	\| History	\| Source	\| Diff