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 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

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

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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

Options
    • -16
    • +51
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 22 more files in changeset.
Wednesday 02 May 2018
1:37 am

Marcin Cieslak

LDEV-4571 Allow (de)selecting all users for org password change

Options
    • -16
    • +46
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 2 more files in changeset.
Tuesday 01 May 2018
2:25 pm

Marcin Cieslak

LDEV-4562 Log password change of all course participants

Options
    • -0
    • +3
    ./lams/admin/web/action/OrgPasswordChangeAction.java
Saturday 24 Mar 2018
2:12 am

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

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

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

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

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

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

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

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

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

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

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

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

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

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

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

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

Options
    • -0
    • +216
    ./lams/admin/web/action/LogEventAction.java
    • -3
    • +3
    ./lams/admin/web/action/OrgManageAction.java
    • -0
    • +292
    ./lams/admin/web/action/OrgPasswordChangeAction.java
    • -9
    • +9
    ./lams/admin/web/action/UserSearchAction.java
  5. … 80 more files in changeset.
Monday 05 Mar 2018
8:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    ./lams/admin/web/action/OrgManageAction.java
    • -5
    • +5
    ./lams/admin/web/action/UserSearchAction.java
  3. … 33 more files in changeset.
Friday 23 Feb 2018
4:43 pm

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -23
    • +62
    ./lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    ./lams/admin/web/action/UserSearchAction.java
  3. … 6 more files in changeset.
Thursday 22 Feb 2018
11:18 pm

Marcin Cieslak

LDEV-4519 Email changed password to users

Options
    • -5
    • +20
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 1 more file in changeset.
11:01 pm

Marcin Cieslak

LDEV-4519 Real password change

Also correctly bind form widgets with its fields

and process checkboxes correctly.

Options
    • -2
    • +49
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 2 more files in changeset.
8:37 pm

Marcin Cieslak

LDEV-4519 Add form validation and success message

Options
    • -2
    • +43
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 4 more files in changeset.
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -2
    • +16
    ./lams/admin/web/action/LogEventAction.java
  2. … 65 more files in changeset.
Wednesday 21 Feb 2018
11:09 pm

Marcin Cieslak

LDEV-4519 Add paged, sortable user grids

Options
    • -1
    • +13
    ./lams/admin/AdminConstants.java
    • -0
    • +78
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  3. … 9 more files in changeset.
7:39 pm

Marcin Cieslak

LDEV-4519 Allow password re-generating

Options
    • -1
    • +10
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 2 more files in changeset.
7:19 pm

Marcin Cieslak

LDEV-4519 Display organisation name as a title

Options
    • -0
    • +8
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 2 more files in changeset.
Tuesday 20 Feb 2018
11:02 pm

Marcin Cieslak

LDEV-4519 Basic form for org password change

Options
    • -0
    • +3
    ./lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 4 more files in changeset.
12:19 pm

Marcin Cieslak

LDEV-4519 Add button and blank page for org password change

Options
    • -0
    • +50
    ./lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    ./lams/admin/web/action/UserManageAction.java
    • -3
    • +11
    ./lams/admin/web/dto/UserListDTO.java
  4. … 5 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./lams/admin/adminApplicationContext.xml
    • -7
    • +7
    ./lams/admin/service/AdminServiceProxy.java
    • -1
    • +1
    ./lams/admin/service/IImportService.java
    • -20
    • +23
    ./lams/admin/service/ImportService.java
    • -1
    • +3
    ./lams/admin/web/action/ImportGroupsAction.java
    • -18
    • +29
    ./lams/admin/web/action/LogEventAction.java
    • -15
    • +24
    ./lams/admin/web/action/OrgSaveAction.java
    • -9
    • +17
    ./lams/admin/web/action/UserAction.java
    • -2
    • +2
    ./lams/admin/web/action/UserSaveAction.java
  10. … 54 more files in changeset.
Friday 02 Feb 2018
7:10 am

Andrey Balan

LDEV-4407 Introduce new IMonitorFullService interface

MonitorService interfaces are redefined now:

1. IMonitorService is going to be used by core modules.

2. IMonitorFullService is used inside of lams_monitoring only and

nowhere else, as it contains lams_monitoring's internal logic and

classes.

Options
    • -12
    • +3
    ./lams/admin/web/action/CloneLessonsAction.java
  2. … 31 more files in changeset.
Monday 29 Jan 2018
12:14 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 First cut of audit log screen implemented.

Options
    • -0
    • +195
    ./lams/admin/web/action/LogEventAction.java
    • -0
    • +2
    ./lams/admin/web/action/SysAdminStartAction.java
  3. … 18 more files in changeset.
Monday 22 Jan 2018
11:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4498 Portrait displayed on user search screen.

Options
    • -1
    • +2
    ./lams/admin/web/action/UserSearchAction.java
  2. … 1 more file in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

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

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

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

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_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

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

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

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/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -3
    • +5
    ./lams/admin/web/action/OrgManageAction.java
    • -16
    • +73
    ./lams/admin/web/action/OrganisationAction.java
  3. … 44 more files in changeset.
Saturday 16 Dec 2017
6:11 pm

Marcin Cieslak

LDEV-4488 Replace "description" column with "create date" in org list

Options
    • -3
    • +5
    ./lams/admin/web/action/OrgManageAction.java
  2. … 3 more files in changeset.
4:44 pm

Marcin Cieslak

LDEV-4486 Prevent user from removing course if there are lessons in it

When sysadming tries to remove a course, he gets warned about lessons

existing in the course or its subcourses. Then he is redirected to a

page where he can remove the lessons. Only if the course and its

subcourses are empty, the course can get removed.

Options
    • -6
    • +13
    ./lams/admin/web/action/OrganisationAction.java
  2. … 2 more files in changeset.
Tuesday 12 Dec 2017
7:24 pm

Marcin Cieslak

LDEV-4485 Implement deletion of all lessons from a course

Options
    • -10
    • +61
    ./lams/admin/web/action/OrganisationAction.java
  2. … 5 more files in changeset.
Monday 27 Nov 2017
7:30 pm

Marcin Cieslak

LDEV-4469 Implement portrait batch upload servlet

Options
    • -0
    • +105
    ./lams/admin/web/action/PortraitBatchUploadAction.java
  2. … 6 more files in changeset.
Monday 25 Sep 2017
8:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -0
    • +1
    ./lams/admin/web/action/UserAction.java
  2. … 5 more files in changeset.
Monday 11 Sep 2017
11:59 am

Marcin Cieslak

LDEV-4408 Allow session deletion

Options
    • -45
    • +0
    ./lams/admin/web/action/SessionListAction.java
    • -0
    • +54
    ./lams/admin/web/action/SessionMaintainAction.java
    • -1
    • +1
    ./lams/admin/web/action/SysAdminStartAction.java
  4. … 5 more files in changeset.
Sunday 10 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • -0
    • +45
    ./lams/admin/web/action/SessionListAction.java
    • -0
    • +1
    ./lams/admin/web/action/SysAdminStartAction.java
  3. … 6 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +232
    ./lams/admin/web/action/OrgManageAction.java
    • -0
    • +328
    ./lams/admin/web/action/ToolContentListAction.java
    • -0
    • +157
    ./lams/admin/web/action/UserSearchAction.java
  4. … 31 more files in changeset.
Friday 18 Aug 2017
3:10 am

Andrey Balan

LDEV-4407 Remove obsolete OrgManageBean class

Options
    • -130
    • +0
    ./lams/admin/web/dto/OrgManageBean.java
    • -3
    • +2
    ./lams/admin/web/dto/UserBean.java
    • -24
    • +0
    ./lams/admin/web/form/OrgManageForm.java
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -141
    • +0
    ./lams/admin/web/ConfigAction.java
    • -73
    • +0
    ./lams/admin/web/DisabledUserManageAction.java
    • -60
    • +0
    ./lams/admin/web/ImportExcelAction.java
    • -55
    • +0
    ./lams/admin/web/ImportExcelForm.java
    • -108
    • +0
    ./lams/admin/web/ImportExcelSaveAction.java
    • -95
    • +0
    ./lams/admin/web/LoginMaintainAction.java
    • -78
    • +0
    ./lams/admin/web/LoginSaveAction.java
    • -232
    • +0
    ./lams/admin/web/OrgManageAction.java
    • -130
    • +0
    ./lams/admin/web/OrgManageBean.java
    • -265
    • +0
    ./lams/admin/web/OrgSaveAction.java
    • -179
    • +0
    ./lams/admin/web/OrganisationAction.java
    • -62
    • +0
    ./lams/admin/web/ScheduledJobDTO.java
    • -111
    • +0
    ./lams/admin/web/ScheduledJobListAction.java
    • -55
    • +0
    ./lams/admin/web/ServerListAction.java
    • -88
    • +0
    ./lams/admin/web/ServerMaintainAction.java
  16. … 62 more files in changeset.