lams-github / lams_admin / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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 28 Sep 2018
8:50 pm

Marcin Cieslak

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

Options
    • -2
    • +2
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -6
    • +0
    ./lams/admin/web/controller/LoginSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/OrgSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/ServerSaveController.java
    • -5
    • +0
    ./lams/admin/web/controller/TimezoneManagementController.java
    • -3
    • +3
    ./lams/admin/web/controller/ToolContentListController.java
    • -2
    • +2
    ./lams/admin/web/controller/UserController.java
    • -0
    • +80
    ./lams/admin/web/form/ExtServerForm.java
  9. … 3 more files in changeset.
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
    • -1
    • +4
    ./lams/admin/adminApplicationContext.xml
    • -51
    • +38
    ./lams/admin/service/ImportService.java
    • -8
    • +0
    ./lams/admin/web/controller/CloneLessonsController.java
    • -4
    • +10
    ./lams/admin/web/controller/ConfigController.java
    • -43
    • +7
    ./lams/admin/web/controller/OrgSaveController.java
    • -12
    • +1
    ./lams/admin/web/controller/OrganisationController.java
    • -0
    • +264
    ./lams/admin/web/controller/PolicyManagementController.java
    • -1
    • +1
    ./lams/admin/web/controller/SysAdminStartController.java
    • -2
    • +7
    ./lams/admin/web/controller/UserController.java
    • -12
    • +0
    ./lams/admin/web/controller/UserSaveController.java
    • -10
    • +0
    ./lams/admin/web/form/OrganisationForm.java
    • -0
    • +108
    ./lams/admin/web/form/PolicyForm.java
    • -295
    • +0
    ./lams/admin/web/action/PolicyManagementAction.java
  14. … 636 more files in changeset.
Monday 10 Sep 2018
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
    • -7
    • +3
    ./lams/admin/service/ImportService.java
  2. … 103 more files in changeset.
Friday 07 Sep 2018
10:34 pm

Andrey Balan

LDEV-4660 Update LAMS code to support POI 3.17 and 4.0

POI libraries are kept at 3.17 version, until they fix the following

issue: java.lang.IllegalArgumentException: Property

'http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit' is not

recognized.

Options
    • -5
    • +6
    ./lams/admin/service/ImportService.java
  2. … 13 more files in changeset.
Friday 31 Aug 2018
5:19 pm

Marcin Cieslak

LDEV-4440 Various fixes in admin

Options
    • -1
    • +1
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserRolesSaveController.java
    • -2
    • +1
    ./lams/admin/web/controller/UserSaveController.java
  5. … 4 more files in changeset.
6:02 am

Joanna Mielczarek <amielczarek.web@gmail.com>

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

Options
    • -2
    • +2
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -3
    • +3
    ./lams/admin/web/controller/UserController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserManageController.java
    • -2
    • +4
    ./lams/admin/web/controller/UserOrgRoleController.java
    • -4
    • +4
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -0
    • +1
    ./lams/admin/web/controller/UserRolesController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserRolesSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/UserSaveController.java
  10. … 22 more files in changeset.
Thursday 30 Aug 2018
1:14 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changed redirect into forward at return of methods

Options
    • -5
    • +8
    ./lams/admin/web/controller/UserRolesSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserSaveController.java
  3. … 1 more file in changeset.
Wednesday 29 Aug 2018
9:13 pm

Andrey Balan

LDEV-4654 userinfoUrl field is no longer required one

Also added * character after all required fields to make required fields

more obvious.

Options
    • -1
    • +1
    ./lams/admin/web/action/ServerSaveAction.java
  2. … 1 more file in changeset.
4:29 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 added setters of userid and orgid

Options
    • -1
    • +5
    ./lams/admin/web/controller/UserRolesController.java
  2. … 1 more file in changeset.
3:41 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 fixed creating courses/subcourses, added annotation with session scope at userorgrole files

Options
    • -1
    • +1
    ./lams/admin/web/controller/OrgSaveController.java
    • -4
    • +4
    ./lams/admin/web/controller/UserOrgRoleController.java
    • -0
    • +2
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
  4. … 1 more file in changeset.
5:40 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed import users, lti / server maintain, user create and edit

Options
    • -3
    • +3
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +1
    ./lams/admin/web/controller/OrgManageController.java
    • -3
    • +3
    ./lams/admin/web/controller/OrgSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/ServerSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserController.java
    • -2
    • +1
    ./lams/admin/web/controller/UserOrgController.java
    • -1
    • +3
    ./lams/admin/web/controller/UserOrgRoleController.java
    • -5
    • +1
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -3
    • +2
    ./lams/admin/web/controller/UserRolesController.java
    • -6
    • +7
    ./lams/admin/web/controller/UserSaveController.java
  12. … 7 more files in changeset.
Tuesday 28 Aug 2018
5:09 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changes at user controller - set orgid and userid

Options
    • -0
    • +3
    ./lams/admin/web/controller/UserController.java
5:56 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Admin migration - fixed tool content list, theme management, ldap, cleaned code at controllers

Options
    • -1
    • +2
    ./lams/admin/web/controller/CleanupPreviewLessonsController.java
    • -9
    • +3
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +4
    ./lams/admin/web/controller/CloneLessonsController.java
    • -2
    • +2
    ./lams/admin/web/controller/ConfigController.java
    • -2
    • +2
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/LoginSaveController.java
    • -18
    • +41
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -3
    • +4
    ./lams/admin/web/controller/OrgSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/OrganisationController.java
    • -3
    • +3
    ./lams/admin/web/controller/ServerMaintainController.java
    • -20
    • +47
    ./lams/admin/web/controller/ServerSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/TimezoneManagementController.java
    • -7
    • +7
    ./lams/admin/web/controller/ToolContentListController.java
    • -5
    • +5
    ./lams/admin/web/controller/UserController.java
    • -3
    • +3
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
  16. … 21 more files in changeset.
Monday 27 Aug 2018
2:55 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin - fixed import, ldap and toolcontentlist

Options
    • -2
    • +2
    ./lams/admin/web/controller/LdapConfigController.java
    • -10
    • +15
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -3
    • +5
    ./lams/admin/web/controller/ServerSaveController.java
    • -3
    • +3
    ./lams/admin/web/controller/ThemeManagementController.java
    • -7
    • +12
    ./lams/admin/web/controller/ToolContentListController.java
    • -11
    • +12
    ./lams/admin/web/form/LtiConsumerForm.java
  7. … 10 more files in changeset.
Saturday 25 Aug 2018
6:53 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Admin - fixed sign up management, added errorMaps

Options
    • -1
    • +1
    ./lams/admin/web/controller/OrgManageController.java
    • -4
    • +3
    ./lams/admin/web/controller/OrgSaveController.java
    • -1
    • +0
    ./lams/admin/web/controller/OrganisationController.java
    • -10
    • +13
    ./lams/admin/web/controller/ServerSaveController.java
    • -11
    • +16
    ./lams/admin/web/controller/SignupManagementController.java
    • -12
    • +12
    ./lams/admin/web/form/ExtServerForm.java
  7. … 39 more files in changeset.
Friday 24 Aug 2018
11:17 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin - fixed userChangePass and userRoles

Options
    • -1
    • +1
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -2
    • +2
    ./lams/admin/web/controller/ConfigController.java
    • -2
    • +2
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/LoginSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/OrgPasswordChangeController.java
    • -21
    • +8
    ./lams/admin/web/controller/OrgSaveController.java
    • -3
    • +3
    ./lams/admin/web/controller/ServerMaintainController.java
    • -1
    • +1
    ./lams/admin/web/controller/ServerSaveController.java
    • -2
    • +2
    ./lams/admin/web/controller/SignupManagementController.java
    • -2
    • +2
    ./lams/admin/web/controller/TimezoneManagementController.java
    • -1
    • +1
    ./lams/admin/web/controller/ToolContentListController.java
    • -9
    • +9
    ./lams/admin/web/controller/UserController.java
    • -3
    • +3
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
    • -6
    • +2
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserRolesController.java
  16. … 14 more files in changeset.
3:09 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin - no struts

Options
    • -4
    • +0
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -4
    • +0
    ./lams/admin/web/controller/ImportGroupsController.java
    • -0
    • +1
    ./lams/admin/web/controller/LdapConfigController.java
    • -10
    • +4
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -4
    • +0
    ./lams/admin/web/controller/ServerMaintainController.java
    • -4
    • +0
    ./lams/admin/web/controller/ServerSaveController.java
    • -3
    • +2
    ./lams/admin/web/controller/ToolContentListController.java
    • -7
    • +7
    ./lams/admin/web/controller/UserController.java
    • -28
    • +24
    ./lams/admin/web/controller/UserSaveController.java
    • -2
    • +2
    ./lams/admin/web/form/ExtServerForm.java
    • -0
    • +19
    ./lams/admin/web/form/LtiConsumerForm.java
    • -12
    • +0
    ./lams/admin/web/form/ThemeForm.java
    • -2
    • +0
    ./lams/admin/web/form/UserOrgRoleForm.java
  14. … 37 more files in changeset.
Thursday 23 Aug 2018
1:37 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin

Options
    • -5
    • +4
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -1
    • +1
    ./lams/admin/web/controller/ImportGroupsController.java
    • -1
    • +1
    ./lams/admin/web/controller/ImportUserResultController.java
    • -2
    • +4
    ./lams/admin/web/controller/LdapConfigController.java
    • -2
    • +1
    ./lams/admin/web/controller/LoginSaveController.java
    • -3
    • +3
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +5
    ./lams/admin/web/controller/ServerMaintainController.java
    • -12
    • +10
    ./lams/admin/web/controller/ServerSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/SessionMaintainController.java
    • -16
    • +13
    ./lams/admin/web/controller/SignupManagementController.java
    • -1
    • +1
    ./lams/admin/web/controller/StatisticsController.java
    • -2
    • +2
    ./lams/admin/web/controller/TimezoneManagementController.java
    • -1
    • +1
    ./lams/admin/web/controller/ToolContentListController.java
    • -0
    • +20
    ./lams/admin/web/form/ImportGroupsForm.java
  15. … 17 more files in changeset.
Tuesday 21 Aug 2018
10:34 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin in progress

Options
    • -1
    • +1
    ./lams/admin/web/controller/CleanupPreviewLessonsController.java
    • -1
    • +1
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +3
    ./lams/admin/web/controller/ConfigController.java
    • -1
    • +1
    ./lams/admin/web/controller/ImportGroupsController.java
    • -1
    • +1
    ./lams/admin/web/controller/LdapConfigController.java
    • -1
    • +1
    ./lams/admin/web/controller/LogEventController.java
    • -1
    • +1
    ./lams/admin/web/controller/LoginMaintainController.java
    • -1
    • +1
    ./lams/admin/web/controller/LoginSaveController.java
    • -14
    • +8
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -3
    • +2
    ./lams/admin/web/controller/OrgManageController.java
    • -7
    • +6
    ./lams/admin/web/controller/OrgSaveController.java
    • -6
    • +6
    ./lams/admin/web/controller/OrganisationController.java
    • -1
    • +1
    ./lams/admin/web/controller/ServerListController.java
    • -4
    • +4
    ./lams/admin/web/controller/ServerMaintainController.java
    • -1
    • +2
    ./lams/admin/web/controller/ServerSaveController.java
  16. … 57 more files in changeset.
1:30 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin in progress

Options
    • -2
    • +3
    ./lams/admin/web/controller/ToolContentListController.java
    • -1
    • +2
    ./lams/admin/web/controller/UserBasicListController.java
    • -3
    • +4
    ./lams/admin/web/controller/UserManageController.java
    • -1
    • +2
    ./lams/admin/web/controller/UserOrgController.java
    • -1
    • +2
    ./lams/admin/web/controller/UserOrgRoleController.java
    • -3
    • +3
    ./lams/admin/web/controller/UserOrgRoleSaveController.java
    • -3
    • +3
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -3
    • +4
    ./lams/admin/web/controller/UserRolesSaveController.java
    • -7
    • +7
    ./lams/admin/web/controller/UserSaveController.java
    • -1
    • +2
    ./lams/admin/web/controller/UserSearchSingleTermController.java
  11. … 18 more files in changeset.
Monday 20 Aug 2018
9:42 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of admin in progress

Options
    • -1
    • +1
    ./lams/admin/web/controller/CleanupPreviewLessonsController.java
    • -2
    • +1
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +5
    ./lams/admin/web/controller/CloneLessonsController.java
    • -5
    • +6
    ./lams/admin/web/controller/ConfigController.java
    • -3
    • +2
    ./lams/admin/web/controller/ImportExcelController.java
    • -6
    • +6
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -5
    • +4
    ./lams/admin/web/controller/ImportGroupsController.java
    • -1
    • +2
    ./lams/admin/web/controller/ImportUserResultController.java
    • -4
    • +5
    ./lams/admin/web/controller/LdapConfigController.java
    • -1
    • +2
    ./lams/admin/web/controller/LogEventController.java
    • -1
    • +2
    ./lams/admin/web/controller/LoginMaintainController.java
    • -14
    • +13
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -1
    • +2
    ./lams/admin/web/controller/OrgManageController.java
    • -1
    • +2
    ./lams/admin/web/controller/OrgPasswordChangeController.java
    • -5
    • +6
    ./lams/admin/web/controller/OrgSaveController.java
  16. … 41 more files in changeset.
Thursday 16 Aug 2018
11:46 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Actions changed to controllers

Options
    • -15
    • +15
    ./lams/admin/service/IImportService.java
    • -19
    • +19
    ./lams/admin/service/ImportService.java
    • -2
    • +1
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -4
    • +1
    ./lams/admin/web/controller/CloneLessonsController.java
    • -141
    • +0
    ./lams/admin/web/controller/ConfigAction.java
    • -0
    • +140
    ./lams/admin/web/controller/ConfigController.java
    • -73
    • +0
    ./lams/admin/web/controller/DisabledUserManageAction.java
    • -0
    • +79
    ./lams/admin/web/controller/DisabledUserManageController.java
    • -61
    • +0
    ./lams/admin/web/controller/ImportExcelAction.java
    • -0
    • +59
    ./lams/admin/web/controller/ImportExcelController.java
    • -109
    • +0
    ./lams/admin/web/controller/ImportExcelSaveAction.java
    • -0
    • +112
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -80
    • +0
    ./lams/admin/web/controller/ImportGroupsAction.java
    • -0
    • +83
    ./lams/admin/web/controller/ImportGroupsController.java
    • -93
    • +0
    ./lams/admin/web/controller/ImportUserResultAction.java
  16. … 67 more files in changeset.
Wednesday 15 Aug 2018
12:10 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of admin - added spring-servlet, changed web.xml, new forms files

Options
    • -132
    • +0
    ./lams/admin/web/action/CleanupPreviewLessonsAction.java
    • -136
    • +0
    ./lams/admin/web/action/CleanupTempFilesAction.java
    • -239
    • +0
    ./lams/admin/web/action/CloneLessonsAction.java
    • -141
    • +0
    ./lams/admin/web/action/ConfigAction.java
    • -73
    • +0
    ./lams/admin/web/action/DisabledUserManageAction.java
    • -61
    • +0
    ./lams/admin/web/action/ImportExcelAction.java
    • -109
    • +0
    ./lams/admin/web/action/ImportExcelSaveAction.java
    • -80
    • +0
    ./lams/admin/web/action/ImportGroupsAction.java
    • -93
    • +0
    ./lams/admin/web/action/ImportUserResultAction.java
    • -229
    • +0
    ./lams/admin/web/action/LdapConfigAction.java
    • -216
    • +0
    ./lams/admin/web/action/LogEventAction.java
    • -95
    • +0
    ./lams/admin/web/action/LoginMaintainAction.java
    • -78
    • +0
    ./lams/admin/web/action/LoginSaveAction.java
    • -187
    • +0
    ./lams/admin/web/action/LtiConsumerManagementAction.java
    • -234
    • +0
    ./lams/admin/web/action/OrgManageAction.java
  16. … 96 more files in changeset.
Wednesday 08 Aug 2018
5:46 pm

Marcin Cieslak

LDEV-4644 Global outcomes management via sysadmin

Options
    • -0
    • +1
    ./lams/admin/web/action/SysAdminStartAction.java
  2. … 4 more files in changeset.
Monday 30 Jul 2018
10:40 pm

Marcin Cieslak

LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

Options
    • -3
    • +2
    ./lams/admin/service/ImportService.java
  2. … 19 more files in changeset.
3:22 pm

Marcin Cieslak

LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

Options
    • -0
    • +8
    ./lams/admin/web/action/ConfigAction.java
  2. … 5 more files in changeset.
Friday 20 Jul 2018
5:22 am

Andrey Balan

LDEV-4627 Make sure country has an appropriate value

Options
    • -4
    • +1
    ./lams/admin/service/ImportService.java
Wednesday 18 Jul 2018
9:02 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

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

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

Options
    • -14
    • +4
    ./lams/admin/web/action/OrganisationAction.java
    • -0
    • +295
    ./lams/admin/web/action/PolicyManagementAction.java
  3. … 25 more files in changeset.
Tuesday 17 Jul 2018
9:36 pm

Marcin Cieslak

LDEV-4617 Add an option to enable email verification on sign up

Options
    • -0
    • +2
    ./lams/admin/web/action/SignupManagementAction.java
  2. … 9 more files in changeset.
Tuesday 10 Jul 2018
1:13 am

Andrey Balan

LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

Options
    • -1
    • +4
    ./lams/admin/adminApplicationContext.xml
    • -28
    • +26
    ./lams/admin/service/ImportService.java
  3. … 5 more files in changeset.