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
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.
Monday 09 Jul 2018
1:18 am

Marcin Cieslak

Merge branch 'LDEF-4627'

Options
    • -0
    • +2
    ./lams/admin/web/action/UserAction.java
Sunday 08 Jul 2018
7:20 pm

Andrey Balan

LDEV-4628 Set default timezone when creating a user

* Also fix an issue with storing server'd timezone containing

"+", e.g. "ETC+4"

Options
    • -1
    • +6
    ./lams/admin/web/action/UserAction.java
  2. … 1 more file in changeset.
5:30 pm

Marcin Cieslak

LDEV-4625 Use the default country when creating a new user by sysadmin

Options
    • -0
    • +2
    ./lams/admin/web/action/UserAction.java
5:27 pm

Marcin Cieslak

LDEV-4625 Make server country configurable

Also use default country in integrations

Options
    • -1
    • +3
    ./lams/admin/web/action/ConfigAction.java
  2. … 7 more files in changeset.
4:31 pm

Marcin Cieslak

LDEV-4625 Use default country configured on server

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

Marcin Cieslak

LDEV-4626 Use default country when importing users

Options
    • -1
    • +5
    ./lams/admin/service/ImportService.java
3:50 pm

Marcin Cieslak

LDEV-4616 Do not look for removed locale when saving an org

Options
    • -23
    • +19
    ./lams/admin/web/action/OrgSaveAction.java
3:58 am

Andrey Balan

LDEV-4624 Signup page to use system language for country list

Options
    • -1
    • +1
    ./lams/admin/web/action/UserAction.java
  2. … 4 more files in changeset.
Saturday 07 Jul 2018
11:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -15
    • +4
    ./lams/admin/service/ImportService.java
    • -21
    • +0
    ./lams/admin/web/action/OrgSaveAction.java
    • -14
    • +4
    ./lams/admin/web/action/OrganisationAction.java
  4. … 10 more files in changeset.
3:20 pm

Marcin Cieslak

LDEV-4615 Add create date on user page in admin

Options
    • -1
    • +3
    ./lams/admin/web/action/UserAction.java
  2. … 2 more files in changeset.
Thursday 05 Jul 2018
8:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -1
    • +1
    ./lams/admin/web/action/UserAction.java
  2. … 6 more files in changeset.
Saturday 30 Jun 2018
5:35 am

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
    • -18
    • +20
    ./lams/admin/web/action/UserAction.java
    • -14
    • +6
    ./lams/admin/web/action/UserSaveAction.java
  3. … 11 more files in changeset.
Friday 29 Jun 2018
2:18 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

Options
    • -47
    • +36
    ./lams/admin/web/action/PolicyManagementAction.java
  2. … 9 more files in changeset.
Thursday 28 Jun 2018
6:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -89
    • +102
    ./lams/admin/web/action/PolicyManagementAction.java
    • -37
    • +0
    ./lams/admin/web/dto/UserPolicyConsentDTO.java
  3. … 12 more files in changeset.
Saturday 23 Jun 2018
8:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -59
    • +87
    ./lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +1
    ./lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    ./lams/admin/web/dto/UserPolicyConsentDTO.java
  4. … 25 more files in changeset.
Thursday 31 May 2018
11:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +265
    ./lams/admin/web/action/PolicyManagementAction.java
    • -0
    • +1
    ./lams/admin/web/action/SysAdminStartAction.java
  3. … 20 more files in changeset.
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.