Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Add missing no-arg constructors

They are required by LD import in authoring.

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.

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180731.sql
  1. … 14 more files in changeset.
LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

    • -0
    • +16
    ./lamsfoundation/lams/dbupdates/patch20180730.sql
    • -1
    • +9
    ./lamsfoundation/lams/util/Emailer.java
  1. … 3 more files in changeset.
LDEV-4440 Tweak file validators to return correct messages

    • -107
    • +2
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  1. … 3 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.

    • -8
    • +57
    ./lamsfoundation/lams/util/LanguageUtil.java
  1. … 3 more files in changeset.
Merge branch 'LDEV-4609'

    • -0
    • +24
    ./lamsfoundation/lams/dbupdates/patch20180629.sql
  1. … 3 more files in changeset.
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
    • +29
    ./lamsfoundation/lams/commonContext.xml
  1. … 25 more files in changeset.
LDEV-4617 Implement full email verification on sign up

  1. … 7 more files in changeset.
LDEV-4440 Necessary changes for validation

    • -40
    • +46
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
LDEV-4617 Add an option to enable email verification on sign up

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180717.sql
  1. … 8 more files in changeset.
LDEV-4609 Sort attempts in reverse order

It was implemented from the start, but our Java -> jqGrid XML conversion

method sorts the rows in ascending order by default.

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

  1. … 8 more files in changeset.
LDEV-4440 Added new way of sending error messages

    • -631
    • +632
    ./lamsfoundation/lams/commonContext.xml
  1. … 10 more files in changeset.
LDEV-4440 Started migration of Noticeboard

    • -0
    • +199
    ./lamsfoundation/lams/util/FileValidatorSpringUtil.java
  1. … 45 more files in changeset.
LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

    • -1
    • +2
    ./lamsfoundation/lams/integrationContext.xml
  1. … 3 more files in changeset.
LDEV-4631 Prevent accidental storing of timezone as JVM one

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. … 5 more files in changeset.
LDEV-4625 Make server country configurable

Also use default country in integrations

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180708.sql
    • -2
    • +2
    ./lamsfoundation/lams/util/LanguageUtil.java
  1. … 4 more files in changeset.
LDEV-4625 Use default country configured on server

    • -16
    • +23
    ./lamsfoundation/lams/util/LanguageUtil.java
  1. … 1 more file in changeset.
LDEV-4624 Signup page to use system language for country list

    • -2
    • +8
    ./lamsfoundation/lams/util/LanguageUtil.java
    • -0
    • +22
    ./lamsfoundation/lams/util/MessageService.java
  1. … 3 more files in changeset.
LDEV-4616 Remove locale from courses

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180707.sql
  1. … 10 more files in changeset.
LDEV-4440 Almost finished learning and monitoring - needed corrections

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

    • -22
    • +48
    ./lamsfoundation/lams/util/LanguageUtil.java
  1. … 6 more files in changeset.
LDEV-4620 Submit Files tool to log release marks event

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180704.sql
  1. … 2 more files in changeset.
LDEV-4620 Change return type of getLessonActivityIdsForToolContentId

    • -1
    • +1
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
LDEV-4440 Started learning migration

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

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

    • -13
    • +13
    ./lamsfoundation/lams/util/CommonConstants.java
  1. … 2 more files in changeset.
LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

    • -1
    • +0
    ./lamsfoundation/lams/lesson/LearnerProgress.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.

  1. … 11 more files in changeset.
LDEV-4605 Introduce CommonConstants.java

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

country codes.

    • -0
    • +24
    ./lamsfoundation/lams/util/CommonConstants.java
  1. … 1 more file in changeset.