lams-github

lams_admin

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +76
    ./conf/language/lams/ApplicationResources_no_NO.properties
  4. … 54 more files in changeset.
Thursday 29 Mar 2018
8:01 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4485 LDEV-4519 LDEV-4501 LDEV-4366

Adding missing labels for these JIRAs

Options
    • -68
    • +67
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +68
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    ./src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -0
    • +292
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
  5. … 80 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -8
    • +16
    ./web/error.jsp
  2. … 34 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
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
  3. … 33 more files in changeset.
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -0
    • +39
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +21
    ./web/WEB-INF/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles-defs.xml
  4. … 11 more files in changeset.
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Debugging removed for merge to master.

Options
    • -19
    • +0
    ./web/logevent.jsp
Friday 23 Feb 2018
4:43 pm

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -23
    • +62
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +6
    ./web/orgPasswordChange.jsp
  4. … 5 more files in changeset.
Thursday 22 Feb 2018
11:18 pm

Marcin Cieslak

LDEV-4519 Email changed password to users

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
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
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -4
    • +5
    ./web/WEB-INF/struts-config.xml
    • -20
    • +25
    ./web/orgPasswordChange.jsp
8:37 pm

Marcin Cieslak

LDEV-4519 Add form validation and success message

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +43
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    ./web/WEB-INF/struts-config.xml
    • -56
    • +71
    ./web/orgPasswordChange.jsp
  5. … 1 more file in changeset.
6:08 pm

Marcin Cieslak

LDEV-4519 Layout adjustments

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -10
    • +31
    ./web/orgPasswordChange.jsp
5:29 pm

Marcin Cieslak

LDEV-4519 Store users excluded from password change

Minor CSS changes

Options
    • -2
    • +2
    ./web/WEB-INF/struts-config.xml
    • -5
    • +46
    ./web/orgPasswordChange.jsp
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +16
    ./src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
    • -12
    • +44
    ./web/logevent.jsp
  4. … 63 more files in changeset.
Wednesday 21 Feb 2018
11:09 pm

Marcin Cieslak

LDEV-4519 Add paged, sortable user grids

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/admin/AdminConstants.java
    • -0
    • +78
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -33
    • +98
    ./web/orgPasswordChange.jsp
  5. … 7 more files in changeset.
7:47 pm

Marcin Cieslak

LDEV-4519 Prevent both group checkboxes from being unchecked

Options
    • -1
    • +7
    ./web/orgPasswordChange.jsp
7:43 pm

Marcin Cieslak

LDEV-4519 Prompt user to enter own password or generate one

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +5
    ./web/orgPasswordChange.jsp
7:39 pm

Marcin Cieslak

LDEV-4519 Allow password re-generating

Options
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -2
    • +17
    ./web/orgPasswordChange.jsp
7:19 pm

Marcin Cieslak

LDEV-4519 Display organisation name as a title

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -0
    • +4
    ./web/orgPasswordChange.jsp
Tuesday 20 Feb 2018
11:02 pm

Marcin Cieslak

LDEV-4519 Basic form for org password change

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +3
    ./web/WEB-INF/struts-config.xml
    • -0
    • +194
    ./web/orgPasswordChange.jsp
  5. … 1 more file in changeset.
12:19 pm

Marcin Cieslak

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

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java
    • -0
    • +21
    ./web/WEB-INF/struts-config.xml
    • -0
    • +4
    ./web/WEB-INF/tiles-defs.xml
    • -0
    • +0
    ./web/orgPasswordChange.jsp
    • -0
    • +3
    ./web/userlist.jsp
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 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
    • -0
    • +30
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -20
    • +23
    ./src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java
    • -18
    • +29
    ./src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
    • -15
    • +24
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
    • -9
    • +17
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
    • -6
    • +21
    ./web/logevent.jsp
  12. … 52 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
    • -1
    • +0
    ./.classpath
    • -12
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java
  3. … 30 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
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +195
    ./src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +21
    ./web/WEB-INF/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles-defs.xml
    • -0
    • +214
    ./web/logevent.jsp
  7. … 14 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
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -2
    • +9
    ./web/usersearchlist.jsp
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 more files 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
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -16
    • +73
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
  3. … 44 more files in changeset.
Saturday 16 Dec 2017
6:25 pm

Marcin Cieslak

LDEV-4488 Add "create date" in org details

Options
    • -0
    • +10
    ./web/organisation/list.jsp
6:11 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -2
    • +2
    ./web/organisation/list.jsp
  4. … 1 more file in changeset.