Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Rewrite validation in PedPlanner forms

  1. … 7 more files in changeset.
LDEV-4627 Set country and locale for users created via integrations

New locale detecting algorithm:

1. Check whether we have exactly the same locale. If we do - select it.

2. Grab the first two letters of the provided locale (which we assume to

be the language code), and map it to one of our locales of the

respective language. If we have multiple ones - choose the first one

from the list indiscriminately.

3. If we don't have locale of such language - use the server default

one.

  1. … 4 more files in changeset.
LDEV-4627 Courses doesn't have specific locale any longer

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
    • +15
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 26 more files in changeset.
LDEV-4617 Implement full email verification on sign up

  1. … 9 more files in changeset.
LDEV-4627 Fix the issue of not passing "lang" parameter

There was an exception thrown on accessing LoginRequest with

missing lang parameter (i.e. URL doesn't contain lang parameter at all)

LDEV-4440 Added new spring version of grouping form

  1. … 1 more file in changeset.
LDEV-4440 notebook nostruts library

  1. … 19 more files in changeset.
LDEV-4440 Necessary changes for migration to Spring - changes in method of validation

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

  1. … 6 more files in changeset.
LDEV-4627 Accept country in integrations servlet

If a received langIsoCode is just 2 letters, then countryIsoCode stays

the same and country will fall back to default. If langIsoCode is en_AU,

then it gets split to langIsoCode and countryIsoCode and the old value

of countryIsoCode is considered country.

  1. … 3 more files in changeset.
LDEV-4624 Signup page to use system language for country list

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

  1. … 5 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. … 10 more files in changeset.
LDEV-4605 Introduce CommonConstants.java

For starters it will contain user portrait dimensions and the list of

country codes.

  1. … 3 more files in changeset.
LDEV-4440 Almost finished authoring migration

    • -0
    • +99
    ./org/lamsfoundation/lams/web/TextSearchForm.java
  1. … 22 more files in changeset.
LDEV-4440 Finishing authoring migration

  1. … 19 more files in changeset.
Merge branch 'LDEV-4593'

    • -0
    • +15
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 5 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.
Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

  1. … 14 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

    • -8
    • +14
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -30
    • +179
    ./org/lamsfoundation/lams/web/action/LtiAction.java
  1. … 21 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -1
    • +11
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 25 more files in changeset.
LDEV-4594 Turn on/off the integration learner index page block

    • -8
    • +14
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 7 more files in changeset.
LDEV-4593 Introduce Policies & consent feature

    • -0
    • +5
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +153
    ./org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
  1. … 20 more files in changeset.
LDEV-4589 Fix warning message

LDEV-4590 Rating stars left can never be more than 5 stars

  1. … 3 more files in changeset.
LDEV-4589 Implement LTI Deep Linking feature

    • -10
    • +156
    ./org/lamsfoundation/lams/web/action/LtiAction.java
  1. … 1 more file in changeset.
LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

  1. … 14 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
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 19 more files in changeset.
LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

    • -0
    • +21
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 2 more files in changeset.