lams_admin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4627 Make sure country has an appropriate value

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

  1. … 25 more files in changeset.
LDEV-4617 Add an option to enable email verification on sign up

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

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. … 5 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

    • -12
    • +0
    ./web/organisation/courseAdminEdit.jsp
    • -12
    • +0
    ./web/organisation/createOrEdit.jsp
  1. … 5 more files in changeset.
LDEV-4615 Add create date on user page in admin

LDEV-4593: Adding English labels. LDEV-4605: removing country list from admin

LDEV-4593: Adding Spanish labels

LDEV-4614: Moving labels around

Moving labels for countries out of lams_admin and lams_central to lams_common instead.

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

  1. … 5 more files in changeset.
LDEV-4620 Submit Files tool to log release marks event

  1. … 6 more files in changeset.
LDEV-4605: Adding country list in Greek

LDEV-4605: Adding country list in Spanish

Adding country list in Español

  1. … 1 more file in changeset.
LDEV-4605 adding missing country/territory

I forgot to include BQ = Bonaire, Saint Eustatius and Saba. Glad no one noticed ;-)

  1. … 2 more files in changeset.
Merge branch 'LDEV-4605'

  1. … 1 more file 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. … 9 more files in changeset.
LDEV-4593: small UI changes

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

Merge branch 'LDEV-4593'

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

* Remove "Create a new draft" functionality

* Add policy details page

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

    • -0
    • +100
    ./web/policies/policyTable.jsp
  1. … 6 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -0
    • +143
    ./web/policies/editPolicy.jsp
    • -0
    • +164
    ./web/policies/policies.jsp
    • -81
    • +0
    ./web/policies/previousVersionsList.jsp
    • -0
    • +82
    ./web/policies/userConsents.jsp
  1. … 16 more files in changeset.
LDEV-4054: Updating labels in various projects

English, Spanish and Greek

  1. … 10 more files in changeset.