Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4887 Adding id, classes to make automated testing faster

  1. … 2 more files in changeset.
LDEV-4901 Rewrite session invalidation mechanism

On WildFly 8 session invalidation mechanism had some bugs. Marek

introduced a workaround in LDEV-3413. The mechanism was adjusted in

LDEV-4293, especially in this commit

https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=131ce42e64069f574a2a4a9bc1e5c4be4918e5bb

Newer WildFly versions do not seem to have this bug. A part of

workaround was removed in LDEV-4696, but invalidation mechanism stayed

as if the bugs were still present. The mechanism introduced the problem

with timeouts. Now that the bugs seems to be gone, the invalidation

mechanism was rewritten to a more straightforward version which should

have been used from the start.

It is worth keeping in mind that when one user session is present and

another is being created (another browser, integration call, sysadmin's

LoginAs feature), then user gets authenticated, then old session gets

invalidated and the user gets authenticated AGAIN by WildFly using

cached credentials. Caching is so useful that we can not turn it off. It

means that, though, we need to keep login token generated by

LoginRequestServlet for longer than just first authentication, as we get

authentication call twice. Now we keep it until it is timed out.

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

LDEV-4898 Fix race condition when generating a LD SVG

LDEV-4893 Current activity opens in a pop up in monitor progress bar

LDEV-4879 Create lesson in subgroups at one go

  1. … 3 more files in changeset.
LDEV-3000 Add a fix for QTI import pop up closing in Chrome

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

    • -0
    • +1
    ./authoring/template/tool/assessmcq.jsp
    • -0
    • +2
    ./authoring/template/tool/assessment.jsp
    • -1
    • +1
    ./authoring/template/tool/mcquestion.jsp
  1. … 7 more files in changeset.
LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

  1. … 2 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

  1. … 8 more files in changeset.
LDEV-4884 UUIDs in QTI export/import in QB

  1. … 4 more files in changeset.
Merge branch 'master' into develop

LDEV-4873 Revert LAMS copyright label removal

Merge branch 'master' into develop

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

    • -0
    • +25
    ./css/bootstrap-tourist.min.css
    • -0
    • +12
    ./includes/javascript/bootstrap-tourist.min.js
  1. … 3 more files in changeset.
Merge branch 'master' into develop

Conflicts:

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

  1. … 4 more files in changeset.
LDEV-4873 Remove version numbering from login and main pages

And add it instead to sysadmin.jsp

  1. … 1 more file in changeset.
LDEV-4877 Upgrade bootstrap library to version 3.4.1

* bootstrap-slider to 10.6.2

* bootstrap-tour to 0.12.0

    • -3
    • +3
    ./includes/javascript/bootstrap-slider.js
    • -4
    • +3
    ./includes/javascript/bootstrap.min.js
LDEV-4875 Fixes for VSA feature

  1. … 22 more files in changeset.
LKC-221 Rearrange and regenerate LD SVG after activities were modified

LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -24
    • +26
    ./includes/javascript/qb-option.js
    • -0
    • +231
    ./qb/authoring/addVsa.jsp
    • -207
    • +0
    ./qb/authoring/addshortanswer.jsp
    • -19
    • +0
    ./qb/authoring/shortansweroption.jsp
    • -0
    • +23
    ./qb/authoring/vsaOption.jsp
  1. … 67 more files in changeset.
LDEV-4871 Fix query string building when requesting a print page

LKC-215 Modify question review flow

LKC-215 Importing questions from QB to WA

  1. … 1 more file in changeset.
LDEV-4863 Q&A authoring to look more like Assessment essay authoring

  1. … 7 more files in changeset.
LDEV-4853 Add info that treeview library has been customised for LAMS

LDEV-4853 Fix a minor issue with empty folder display

LDEV-4853 Make locks on read-only folders red.

LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

    • binary
    ./images/css/yui/folders/loading.gif
  1. … 14 more files in changeset.