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
Friday 29 Jun 2018
11:35 pm

Andrey Balan

LDEV-4605 Codify country for users

Change the country field to ISO_3166-1 alpha-2 codes (two letters).

So in when editing the profile, a user should be able to set his/her

country based on the list of countries in the ISO list.

Country should be a compulsory when editing profile, editing user

as group manager and in signup pages.

For integrations, if the country is not passed, then we should default

to a default country server.

Options
    • -0
    • +250
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +20
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -14
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
    • -114
    • +142
    ./web/user.jsp
  5. … 9 more files in changeset.
3:07 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4593: small UI changes

Adding a new label to explain the scope of minor changes to policies

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +19
    ./web/policies/editPolicy.jsp
Thursday 28 Jun 2018
8:26 pm

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +27
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
8:18 pm

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -47
    • +36
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +0
    ./web/WEB-INF/struts-config.xml
    • -2
    • +1
    ./web/policies/editPolicy.jsp
    • -12
    • +3
    ./web/policies/policyTable.jsp
  6. … 5 more files in changeset.
12:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -5
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -89
    • +102
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -37
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
    • -1
    • +6
    ./web/WEB-INF/struts-config.xml
    • -1
    • +1
    ./web/policies/editPolicy.jsp
    • -110
    • +24
    ./web/policies/policies.jsp
    • -0
    • +100
    ./web/policies/policyTable.jsp
    • -53
    • +85
    ./web/policies/userConsents.jsp
  9. … 6 more files in changeset.
Saturday 23 Jun 2018
2:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -7
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -59
    • +87
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
    • -0
    • +6
    ./web/WEB-INF/struts-config.xml
    • -2
    • +2
    ./web/WEB-INF/tiles-defs.xml
    • -138
    • +0
    ./web/policies/edit.jsp
    • -0
    • +143
    ./web/policies/editPolicy.jsp
    • -115
    • +0
    ./web/policies/list.jsp
    • -0
    • +164
    ./web/policies/policies.jsp
    • -81
    • +0
    ./web/policies/previousVersionsList.jsp
    • -0
    • +82
    ./web/policies/userConsents.jsp
  13. … 16 more files in changeset.
Thursday 14 Jun 2018
7:53 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +11
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 10 more files in changeset.
Saturday 02 Jun 2018
4:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 8 more files in changeset.
Thursday 31 May 2018
5:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +31
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +265
    ./src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    ./web/WEB-INF/struts-config.xml
    • -0
    • +12
    ./web/WEB-INF/tiles-defs.xml
    • -0
    • +138
    ./web/policies/edit.jsp
    • -0
    • +115
    ./web/policies/list.jsp
    • -0
    • +81
    ./web/policies/previousVersionsList.jsp
  9. … 14 more files in changeset.
Monday 21 May 2018
1:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -70
    • +137
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 37 more files in changeset.
Friday 18 May 2018
12: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
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
  2. … 22 more files in changeset.
Thursday 10 May 2018
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 15 more files in changeset.
Wednesday 09 May 2018
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Friday 04 May 2018
2:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4565: adding missing label

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
2:10 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4486 LDEV-4366 adding missing labels

Adding missing lables for kumalive and delete organisations

Options
    • -5
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
2:03 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 03 May 2018
4:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4573 Spinner indicates busy and no data found message added.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -11
    • +12
    ./web/logevent.jsp
  3. … 1 more file in changeset.
Tuesday 01 May 2018
7:37 pm

Marcin Cieslak

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

Options
    • -16
    • +46
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
    • -0
    • +2
    ./web/WEB-INF/struts-config.xml
    • -32
    • +99
    ./web/orgPasswordChange.jsp
3:33 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4565 Adding column name for Remarks column in Event Log

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./web/logevent.jsp
3:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 6 more files in changeset.
8:25 am

Marcin Cieslak

LDEV-4562 Log password change of all course participants

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
Monday 09 Apr 2018
3:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Saturday 07 Apr 2018
7:32 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -2
    • +69
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 1 more file in changeset.
Monday 02 Apr 2018
5: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
2: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
Friday 23 Mar 2018
7:12 pm

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
6:55 am

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
1: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
2: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.
2:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Debugging removed for merge to master.

Options
    • -19
    • +0
    ./web/logevent.jsp