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
Tuesday 18 Dec 2018
3:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4737 Course based lesson delete does not throw exception

Options
    • -7
    • +9
    ./lams/admin/web/controller/OrganisationController.java
  2. … 5 more files in changeset.
Friday 14 Dec 2018
7:20 am

Marcin Cieslak

LDEV-4734 Fix org password reset by providing default values to form

Also refactor input names and add extra checks just to be safe.

Options
    • -12
    • +16
    ./lams/admin/web/controller/OrgPasswordChangeController.java
    • -14
    • +14
    ./lams/admin/web/form/OrgPasswordChangeForm.java
  3. … 1 more file in changeset.
5:14 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4733 Clone and delete lessons are shown for SysAdmin

Options
    • -1
    • +1
    ./lams/admin/web/controller/OrganisationController.java
  2. … 3 more files in changeset.
Tuesday 04 Dec 2018
8:51 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    ./lams/admin/web/controller/DisabledUserManageController.java
    • -10
    • +6
    ./lams/admin/web/controller/OrgManageController.java
    • -2
    • +2
    ./lams/admin/web/controller/OrganisationController.java
    • -1
    • +1
    ./lams/admin/web/controller/SysAdminStartController.java
    • -6
    • +4
    ./lams/admin/web/controller/UserBasicListController.java
    • -10
    • +10
    ./lams/admin/web/controller/UserController.java
    • -11
    • +5
    ./lams/admin/web/controller/UserManageController.java
    • -14
    • +14
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -9
    • +7
    ./lams/admin/web/controller/UserRolesController.java
    • -18
    • +18
    ./lams/admin/web/controller/UserSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserSearchController.java
    • -6
    • +4
    ./lams/admin/web/controller/UserSearchSingleTermController.java
  13. … 15 more files in changeset.
Thursday 15 Nov 2018
6:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4697 Audit entries filtering by user and remarks

Options
    • -11
    • +21
    ./lams/admin/web/controller/LogEventController.java
  2. … 6 more files in changeset.
Tuesday 13 Nov 2018
7:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4701 Course admin can create learners in their course.

Also tidied up security checks for various course management functions.

Options
    • -5
    • +8
    ./lams/admin/web/controller/OrgManageController.java
    • -2
    • +10
    ./lams/admin/web/controller/UserManageController.java
    • -1
    • +47
    ./lams/admin/web/controller/UserOrgSaveController.java
    • -1
    • +1
    ./lams/admin/web/controller/UserRolesController.java
    • -12
    • +62
    ./lams/admin/web/controller/UserSaveController.java
    • -0
    • +9
    ./lams/admin/web/dto/UserListDTO.java
  7. … 2 more files in changeset.
Tuesday 23 Oct 2018
10:18 pm

Andrey Balan

LDEV-4440 Prevent form resubmission

Also it fixes problems with making subsequence calls (as forward leaves

/servermaintain/ in the browser's URL which causes problems with

relative paths)

Options
    • -3
    • +3
    ./lams/admin/web/controller/ServerMaintainController.java
Friday 19 Oct 2018
11:38 am

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.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/action/McMonitoringAction.java

Options
    • -0
    • +1
    ./lams/admin/web/controller/SysAdminStartController.java
  2. … 17 more files in changeset.
Monday 08 Oct 2018
11:33 pm

Andrey Balan

LDEV-4687 Log exception

Options
    • -1
    • +4
    ./lams/admin/web/controller/ImportExcelSaveController.java
Friday 05 Oct 2018
6:05 pm

Andrey Balan

LDEV-4440 Activate code that was commented out for testing purposes

Options
    • -6
    • +6
    ./lams/admin/web/controller/ImportExcelSaveController.java
Thursday 04 Oct 2018
1:35 pm

Andrey Balan

LDEV-4440 Switch controllers to use @Autowired service beans

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

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

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

seems to be more preferable than adminMessageService,

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

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

Options
    • -44
    • +13
    ./lams/admin/web/controller/CleanupPreviewLessonsController.java
    • -13
    • +4
    ./lams/admin/web/controller/CleanupTempFilesController.java
    • -29
    • +15
    ./lams/admin/web/controller/CloneLessonsController.java
    • -31
    • +12
    ./lams/admin/web/controller/ConfigController.java
    • -16
    • +3
    ./lams/admin/web/controller/DisabledUserManageController.java
    • -21
    • +13
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -16
    • +3
    ./lams/admin/web/controller/ImportGroupsController.java
    • -11
    • +5
    ./lams/admin/web/controller/ImportUserResultController.java
    • -55
    • +22
    ./lams/admin/web/controller/LdapConfigController.java
    • -29
    • +8
    ./lams/admin/web/controller/LogEventController.java
    • -33
    • +7
    ./lams/admin/web/controller/LtiConsumerManagementController.java
    • -26
    • +7
    ./lams/admin/web/controller/OrgManageController.java
    • -19
    • +17
    ./lams/admin/web/controller/OrgPasswordChangeController.java
    • -34
    • +15
    ./lams/admin/web/controller/OrgSaveController.java
    • -38
    • +31
    ./lams/admin/web/controller/OrganisationController.java
  16. … 168 more files in changeset.
Tuesday 02 Oct 2018
12:39 am

Andrey Balan

LDEV-4440 Fix Spring MVC related issues with signup pages

Options
    • -0
    • +2
    ./lams/admin/web/controller/SignupManagementController.java
  2. … 10 more files in changeset.
Friday 28 Sep 2018
9:36 pm

Andrey Balan

LDEV-4440 fix various Spring MVC related issues

Options
    • -52
    • +14
    ./lams/admin/web/controller/SignupManagementController.java
    • -0
    • +10
    ./lams/admin/web/form/SignupManagementForm.java
  3. … 5 more files in changeset.
5:14 pm

Andrey Balan

LDEV-4440 Fix Policies and consents' Spring MVC related issues

Options
    • -1
    • +1
    ./lams/admin/web/controller/PolicyManagementController.java
  2. … 7 more files in changeset.
2:50 pm

Marcin Cieslak

LDEV-4440 Add default lesson parameters to ext servers

Options
    • -3
    • +3
    ./lams/admin/web/controller/ServerMaintainController.java
  2. … 1 more file in changeset.
2: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
7:22 am

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.
Sunday 09 Sep 2018
7:55 pm

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
4: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
11:19 am

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.
12: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.
Wednesday 29 Aug 2018
7:14 pm

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.
3: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.
10:29 am

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.
9:41 am

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.
Tuesday 28 Aug 2018
11:40 pm

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.
11:09 am

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
Monday 27 Aug 2018
11:56 pm

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.
8:55 am

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
12: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.