Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Added new way of sending error messages

  1. … 8 more files in changeset.
LDEV-4440 Started migration of Noticeboard

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

Also use default country in integrations

  1. … 7 more files in changeset.
LDEV-4624: adding lams.jar

LDEV-4616 Remove locale from courses

  1. … 12 more files in changeset.
LDEV-4440 Almost finished learning and monitoring - needed corrections

  1. … 16 more files in changeset.
Merge branch 'LDEV-4614'

Merge branch 'LDEV-4620'

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. … 9 more files in changeset.
Merge branch 'LDEV-4605'

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

  1. … 22 more files in changeset.
LDEV-4440 Show archived activity attempts in gradebook

  1. … 9 more files in changeset.
LDEV-4440 Finishing authoring migration

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

  1. … 5 more files in changeset.
LDEV-4609 Add archive date to gradebook marks on lesson restart

  1. … 6 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. … 10 more files in changeset.
LDEV-4402 Update MySQL connector source code for version 8.0.11

    • binary
    ./mysql/mysql-connector-java-5.1.46-bin.jar
    • binary
    ./mysql/mysql-connector-java-8.0.11.jar
  1. … 753 more files in changeset.
LDEV-4402 Upgrade to MySQL 8.0.11

This server version requires a newer connector and server time zone

settings.

    • -1
    • +1
    ./mysql/mysql-connector-java.module.xml
  1. … 15 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

  1. … 22 more files in changeset.
LDEV-4607 Remove marks on output change to "none" in monitoring

  1. … 11 more files in changeset.
LDEV-4599 Enable contribution from tool activities

  1. … 9 more files in changeset.
LDEV-4599 Add JWT library. Set up dependencies.

If LAMS has been slimmed before deployment of this patch, it is missing

Jackson library which is needed for JWT library to work. The library can

taken from a fresh copy of WF from the following path:

<WF>modules\system\layers\base\com\fasterxml

It needs to be copied to the slimmed WF instance.

    • binary
    ./json/jjwt-0.9.0.jar
    • -0
    • +35
    ./json/jjwt.module.xml
  1. … 4 more files in changeset.
LDEV-4594 Turn on/off the integration learner index page block

  1. … 8 more files in changeset.
LDEV-4590 Rating stars left can never be more than 5 stars

Merge branch 'LDEV-4589'

* LDEV-4589 Added few parameter names required for Deep linking

    • binary
    ./basiclti-util/basiclti-util-1.2.0.jar
  1. … 2 more files 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.
LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

  1. … 6 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.