lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

LDEV-4588 Websockets replace polling for multiuser mode

    • -86
    • +114
    /lams_tool_mindmap/web/common/mapjs.jsp
LDEV-4589 Fix warning message

Merge branch 'LDEV_NTU-9'

LDEV_NTU-9 Allowfullscreen for iframe CKeditor plugin is not working.

    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
    • -1
    • +1
    /lams_central/web/ckeditor/lang/en-au.js
Merge branch 'LDEV_NTU-7'

LDEV_NTU-7 Page jumps to the top when clicking the link in Grouping.

LDEV-4588 Authoring mode and layout tweaks

    • -24
    • +36
    /lams_tool_mindmap/web/common/mapjs.jsp
LDEV-4588 Adding a colour picker

    • -0
    • +319
    /lams_central/web/css/jquery.minicolors.css
    • binary
    /lams_central/web/images/css/jquery.minicolors.png
    • -22
    • +65
    /lams_tool_mindmap/web/common/mapjs.jsp
LDEV-4590 Rating stars left can never be more than 5 stars

LDEV-4590 Rating stars left can never be more than 5 stars

Merge branch 'LDEV-4589'

LDEV-4589 Implement LTI Deep Linking feature

* LDEV-4589 Add methods and constants for LTI Deep Linking

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

LDEV-4588 Flash removed from authoring, learning and monitor

  1. … 15 more files in changeset.
LDEV-4587 Refresh output definitions if new ones appeared

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).

    • -0
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/css/_authoring_base.scss
LDEV-3115: Missing label for sequence detail

    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

    • -17
    • +17
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
  1. … 34 more files in changeset.
LDEV-4459: small formatting change

LDEV-4054: Adding template labels

Previously removed by accidents as they aren't in i18n yet