Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5277 Create activity column items in order as they appear in LD

    • -53
    • +13
    ./servlet/RepopulateProgressMarksServlet.java
  1. … 1 more file in changeset.
LDEV-5400 Create transaction manually for Flux

    • -43
    • +44
    ./controller/LearnerController.java
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java

    • -1
    • +16
    ./controller/LoadToolActivityController.java
  1. … 2 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

    • -1
    • +16
    ./controller/LoadToolActivityController.java
  1. … 5 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

    • -1
    • +16
    ./controller/LoadToolActivityController.java
  1. … 5 more files in changeset.
LDEV-5083 Fix encoding issue in Learners tab

    • -2
    • +10
    ./controller/LearnerController.java
LDEV-5341 Refactor Security Service

  1. … 35 more files in changeset.
LDEV-5083 Trigger Flux update on each activity entrance

Till now the update was triggered on activity completion. It is a better

approach, but it only worked on finishing tool activities. Gates and,

for example, Leader Selection activity were skipped and would not

trigger learner progress update.

Now update gets triggered on learner joining a lesson and traversing

through each activity, which is good enough. Emitted items get throttled

anyway.

    • -8
    • +0
    ./controller/CompleteActivityController.java
    • -0
    • +8
    ./controller/LoadToolActivityController.java
  1. … 2 more files in changeset.
LDEV-5083 Update learner progress timeline using Flux

    • -1
    • +1
    ./controller/CompleteActivityController.java
    • -13
    • +57
    ./controller/LearnerController.java
  1. … 8 more files in changeset.
LDEV-5083 Update LD canvas and chart on learner joining a lesson

    • -2
    • +2
    ./controller/CompleteActivityController.java
  1. … 5 more files in changeset.
LDEV-5083 Add Sink binding mechanism

    • -1
    • +3
    ./controller/CompleteActivityController.java
  1. … 4 more files in changeset.
LDEV-5083 Initial implementation on monitoring update based on Flux

    • -1
    • +8
    ./controller/CompleteActivityController.java
  1. … 10 more files in changeset.
LDEV-5083 Add activity mark and time taken to learner timeline

    • -8
    • +27
    ./controller/LearnerController.java
  1. … 17 more files in changeset.
LDEV-5083 Add grouping icon to learner vertical timeline

  1. … 1 more file in changeset.
LDEV-5083 Introduce learner progress vertical timeline widget

With some dummy code for testing.

  1. … 6 more files in changeset.
LDEV-5277 Send last activity's score to platform

    • -1
    • +5
    ./controller/CompleteActivityController.java
    • -1
    • +4
    ./controller/LessonCompleteActivityController.java
  1. … 1 more file in changeset.
LDEV-5277 Allow callback on each tool activity completion

    • -15
    • +23
    ./controller/CompleteActivityController.java
    • -1
    • +1
    ./controller/LessonCompleteActivityController.java
  1. … 3 more files in changeset.
LDEV-5219 Use activity ID instead of lesson ID for non-tools

  1. … 3 more files in changeset.
LDEV-5219 Get user from session instead of parameter

  1. … 5 more files in changeset.
LDEV-5219 Display customised messages for various gate types

Move i18n labels from tool to Learning module so they are the same for

all tools.

    • -5
    • +49
    ./controller/LearnerController.java
  1. … 10 more files in changeset.
LDEV-5219 Stop learner from advancing to a closed gate in Assessment

    • -0
    • +17
    ./controller/LearnerController.java
  1. … 7 more files in changeset.
LDEV-4075 Re-introduce skipping branching in Preview

    • -4
    • +2
    ./controller/CompleteActivityController.java
    • -10
    • +14
    ./controller/DisplayOptionsActivityController.java
  1. … 2 more files in changeset.
LDEV-4915, LDEV-3971 Silence an unnecessary exception log

If this exception occurs, the user can probably and should carry on

instead of trying to create a session which already exists.

    • -4
    • +18
    ./controller/LoadToolActivityController.java
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

    • -14
    • +11
    ./controller/GateController.java
  1. … 21 more files in changeset.
LDEV-4989 Inform user of incorrect gate password

  1. … 2 more files in changeset.
LDEV-4989 Password Gate initial implementation

  1. … 35 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

    • -4
    • +4
    ./controller/CompleteActivityController.java
    • -1
    • +1
    ./controller/SequenceActivityController.java
  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4900

    • -26
    • +44
    ./controller/GroupingController.java
  1. … 1 more file in changeset.
Merge branch 'master' into develop

    • -26
    • +44
    ./controller/GroupingController.java
LDEV-4894 Fix opening group details from monitor's Learners tab

    • -26
    • +44
    ./controller/GroupingController.java