lamsfoundation

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Migration of admin in progress

  1. … 18 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 41 more files in changeset.
LDEV-4440 Actions changed to controllers

    • -15
    • +15
    ./lams/admin/service/IImportService.java
    • -19
    • +19
    ./lams/admin/service/ImportService.java
    • -141
    • +0
    ./lams/admin/web/controller/ConfigAction.java
    • -0
    • +140
    ./lams/admin/web/controller/ConfigController.java
    • -0
    • +79
    ./lams/admin/web/controller/DisabledUserManageController.java
    • -0
    • +59
    ./lams/admin/web/controller/ImportExcelController.java
    • -0
    • +112
    ./lams/admin/web/controller/ImportExcelSaveController.java
    • -0
    • +83
    ./lams/admin/web/controller/ImportGroupsController.java
  1. … 67 more files in changeset.
LDEV-4440 Started migration of admin - added spring-servlet, changed web.xml, new forms files

    • -141
    • +0
    ./lams/admin/web/action/ConfigAction.java
    • -61
    • +0
    ./lams/admin/web/action/ImportExcelAction.java
    • -229
    • +0
    ./lams/admin/web/action/LdapConfigAction.java
    • -216
    • +0
    ./lams/admin/web/action/LogEventAction.java
    • -78
    • +0
    ./lams/admin/web/action/LoginSaveAction.java
    • -234
    • +0
    ./lams/admin/web/action/OrgManageAction.java
  1. … 96 more files in changeset.
LDEV-4644 Global outcomes management via sysadmin

  1. … 4 more files in changeset.
LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

    • -3
    • +2
    ./lams/admin/service/ImportService.java
  1. … 19 more files in changeset.
LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

    • -0
    • +8
    ./lams/admin/web/action/ConfigAction.java
  1. … 5 more files in changeset.
LDEV-4627 Make sure country has an appropriate value

    • -4
    • +1
    ./lams/admin/service/ImportService.java
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

    • -0
    • +295
    ./lams/admin/web/action/PolicyManagementAction.java
  1. … 25 more files in changeset.
LDEV-4617 Add an option to enable email verification on sign up

  1. … 9 more files in changeset.
LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

    • -1
    • +4
    ./lams/admin/adminApplicationContext.xml
    • -28
    • +26
    ./lams/admin/service/ImportService.java
  1. … 5 more files in changeset.
Merge branch 'LDEF-4627'

    • -0
    • +2
    ./lams/admin/web/action/UserAction.java
LDEV-4628 Set default timezone when creating a user

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

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

    • -1
    • +6
    ./lams/admin/web/action/UserAction.java
  1. … 1 more file in changeset.
LDEV-4625 Use the default country when creating a new user by sysadmin

    • -0
    • +2
    ./lams/admin/web/action/UserAction.java
LDEV-4625 Make server country configurable

Also use default country in integrations

    • -1
    • +3
    ./lams/admin/web/action/ConfigAction.java
  1. … 7 more files in changeset.
LDEV-4625 Use default country configured on server

    • -1
    • +1
    ./lams/admin/service/ImportService.java
  1. … 3 more files in changeset.
LDEV-4626 Use default country when importing users

    • -1
    • +5
    ./lams/admin/service/ImportService.java
LDEV-4616 Do not look for removed locale when saving an org

    • -23
    • +19
    ./lams/admin/web/action/OrgSaveAction.java
LDEV-4624 Signup page to use system language for country list

    • -1
    • +1
    ./lams/admin/web/action/UserAction.java
  1. … 4 more files in changeset.
LDEV-4616 Remove locale from courses

    • -15
    • +4
    ./lams/admin/service/ImportService.java
    • -21
    • +0
    ./lams/admin/web/action/OrgSaveAction.java
  1. … 10 more files in changeset.
LDEV-4615 Add create date on user page in admin

    • -1
    • +3
    ./lams/admin/web/action/UserAction.java
  1. … 2 more files in changeset.
LDEV-4614 Sort country list by name rather than code

    • -1
    • +1
    ./lams/admin/web/action/UserAction.java
  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.

    • -18
    • +20
    ./lams/admin/web/action/UserAction.java
    • -14
    • +6
    ./lams/admin/web/action/UserSaveAction.java
  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

    • -89
    • +102
    ./lams/admin/web/action/PolicyManagementAction.java
    • -37
    • +0
    ./lams/admin/web/dto/UserPolicyConsentDTO.java
  1. … 12 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

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

    • -0
    • +265
    ./lams/admin/web/action/PolicyManagementAction.java
  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