lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "Merge branch 'LDEV_NTU-12'"

This reverts commit 183bac242c2d086c728767b79b2bf3be9604370a, reversing

changes made to 58e35ac606c140010b53bae4314478e0cf63f05d.

Merge branch 'LDEV_NTU-12'

LDEV_NTU-12 Need to be able to change tool output to blank

LDEV-4599 Add Zoom icon

LDEV-4599 Initial implementation of Zoom tool

    • -0
    • +32
    /lams_tool_zoom/.classpath
    • -0
    • +3
    /lams_tool_zoom/.gitignore
    • -0
    • +18
    /lams_tool_zoom/.project
    • -0
    • +7
    /lams_tool_zoom/build.properties
    • -0
    • +7
    /lams_tool_zoom/build.xml
    • -0
    • +68
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +28
    /lams_tool_zoom/db/sql/activity_insert.sql
    • -0
    • +95
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
    • -0
    • +2
    /lams_tool_zoom/db/sql/db_version_insert.sql
    • -0
    • +16
    /lams_tool_zoom/db/sql/library_insert.sql
  1. … 120 more files in changeset.
LDEV-4599 Add JWT library source code

    • -0
    • +174
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Claims.java
    • -0
    • +18
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Clock.java
    • -0
    • +132
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Header.java
    • -0
    • +107
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/JwsHeader.java
  1. … 67 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.

    • -43
    • +44
    /lams_build/3rdParty.userlibraries
    • binary
    /lams_build/lib/json/jjwt-0.9.0.jar
    • -0
    • +35
    /lams_build/lib/json/jjwt.module.xml
Merge branch 'LDEV_NTU-11'

LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor

Merge branch 'LDEV_NTU-10'

LDEV_NTU-10 Add a column "LAMS group" in exported summary

LDEV-4596: Letters should also display when reviewing questions

Small layout fix

LDEV-4596 Prefix letters shown on results and in monitoring

LDEV-4591 Show only the finished button when no instructions exist

LDEV-4591 Show only the finished button when no instructions exist

LDEV-4588 Modified mapjs source for future reference.

    • -0
    • +66
    /3rdParty_sources/mapjs/Mindmap.instructions
    • binary
    /3rdParty_sources/mapjs/mapjs-3.3.5.zip
  1. … 6 more files in changeset.
LDEV-4588 Remove obselete Flash code

    • -29
    • +0
    /lams_tool_mindmap/src/flash/AS/ActionLoader.as
    • -18
    • +0
    /lams_tool_mindmap/src/flash/AS/BaseConcept.as
    • -119
    • +0
    /lams_tool_mindmap/src/flash/AS/BasicColor.as
    • -194
    • +0
    /lams_tool_mindmap/src/flash/AS/Branch.as
    • -453
    • +0
    /lams_tool_mindmap/src/flash/AS/Concept.as
    • -243
    • +0
    /lams_tool_mindmap/src/flash/AS/Design.as
    • -114
    • +0
    /lams_tool_mindmap/src/flash/AS/InternalBranch.as
    • -132
    • +0
    /lams_tool_mindmap/src/flash/AS/InternalConcept.as
    • -184
    • +0
    /lams_tool_mindmap/src/flash/AS/MindMap.as
    • -82
    • +0
    /lams_tool_mindmap/src/flash/AS/MultiPlayer.as
  1. … 19 more files in changeset.
Merge branch 'LDEV-4588'

LDEV-4588 Show creator name as hover in multiuser mode

    • -4
    • +27
    /lams_tool_mindmap/web/common/mapjs.jsp
Merge branch 'LDEV-4597'

LDEV-4597 Set sent date in emails

Merge branch 'LDEV-4592'

LDEV-4592 Rewrite paths in tool content XML

LDEV-4592 Bump server version

LDs exported with this version do not undergo resources path rewriting

in XML.

LDEV-4592 Remove obsolete configuration keys

LDEV-4594 Turn on/off the integration learner index page block

    • -0
    • +37
    /lams_central/web/errorpages/errorWithMessage.jsp
LDEV-4593 Introduce Policies & consent feature

    • -0
    • +37
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +12
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +138
    /lams_admin/web/policies/edit.jsp
    • -0
    • +115
    /lams_admin/web/policies/list.jsp
    • -0
    • +81
    /lams_admin/web/policies/previousVersionsList.jsp
    • -0
    • +50
    /lams_central/web/policyConsents.jsp
  1. … 7 more files in changeset.
LDEV-4587 Remove obsolete action

LDEV-4587 Add missing bottom border for complex activity in progress bar

    • -0
    • +1
    /lams_central/web/css/_progressBar_base.scss
LDEV-4587 Display all ordered branches in progress bar

Ordered branching should be displayed similarly to optional sequences.