Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

  1. … 5 more files in changeset.
Merge branch 'LDEF-4627'

LDEV-4628 Set default timezone when creating a user

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

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

  1. … 1 more file in changeset.
LDEV-4625 Use the default country when creating a new user by sysadmin

LDEV-4625 Make server country configurable

Also use default country in integrations

  1. … 7 more files in changeset.
LDEV-4625 Use default country configured on server

  1. … 3 more files in changeset.
LDEV-4626 Use default country when importing users

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

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

  1. … 4 more files in changeset.
LDEV-4616 Remove locale from courses

  1. … 10 more files in changeset.
LDEV-4615 Add create date on user page in admin

  1. … 2 more files in changeset.
LDEV-4614 Sort country list by name rather than code

  1. … 6 more files in changeset.
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.

  1. … 11 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

  1. … 9 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

  1. … 12 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -0
    • +37
    ./lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
  1. … 25 more files in changeset.
LDEV-4593 Introduce Policies & consent feature

  1. … 20 more files in changeset.
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

  1. … 22 more files in changeset.
LDEV-4571 Allow (de)selecting all users for org password change

  1. … 2 more files in changeset.
LDEV-4562 Log password change of all course participants

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

    • -0
    • +216
    ./lamsfoundation/lams/admin/web/action/LogEventAction.java
  1. … 80 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 33 more files in changeset.
LDEV-4519 Hide learners who are also staff

  1. … 6 more files in changeset.
LDEV-4519 Email changed password to users

  1. … 1 more file in changeset.
LDEV-4519 Real password change

Also correctly bind form widgets with its fields

and process checkboxes correctly.

  1. … 2 more files in changeset.
LDEV-4519 Add form validation and success message

  1. … 4 more files in changeset.
LDEV-4501 All Audit Log entries are now Log Event entries

  1. … 65 more files in changeset.
LDEV-4519 Add paged, sortable user grids

    • -1
    • +13
    ./lamsfoundation/lams/admin/AdminConstants.java
  1. … 9 more files in changeset.
LDEV-4519 Allow password re-generating

  1. … 2 more files in changeset.
LDEV-4519 Display organisation name as a title

  1. … 2 more files in changeset.