lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5095 Prepare data for activity completion chart

LDEV-4769 Updating Greek

    • -15
    • +15
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
LDEV-5083 Add functional, redesigned version of Required Tasks

    • -29
    • +18
    /lams_monitoring/web/css/components-monitoring.css
    • -23
    • +182
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Add functional, redesigned version of Required Tasks

    • -29
    • +18
    /lams_monitoring/web/css/components-monitoring.css
    • -23
    • +182
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

LDEV-5094 Add Undertow source files for easier debugging.

  1. … 194 more files in changeset.
LDEV-5094 Redirect authenticated user immediately

Detect situation when user is automatically reauthenticating via

integrations and redirect him straight to the desired URL, so the

default servlet does not kick in.

LDEV-5094 Store redriectURL in session rather than URL param

In case an user click Back, the redirectURL is still in session and

login.jsp can pick it up and send to j_security_check.

Merge branch 'LDEV-5093' into v4.0

LDEV-5093 Populate lesson Notebook entry correctly while editing

LDEV-5083 Adjustments to insights and tasks panels

    • -109
    • +97
    /lams_monitoring/web/css/components-monitoring.css
    • -15
    • +23
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Adjustments to insights and tasks panels

    • -109
    • +97
    /lams_monitoring/web/css/components-monitoring.css
    • -15
    • +23
    /lams_monitoring/web/monitor5.jsp
Merge branch 'LDEV-5092' into v4.0

LDEV-5092 Fix Arrow tag attributes in Task List tool authoring

LDEV-4769 Updating Greek

LDEV-5083 Adjustments to graph, grades and sequence layout

    • -27
    • +15
    /lams_central/web/css/components.css
    • -31
    • +28
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -66
    • +59
    /lams_monitoring/web/css/components-monitoring.css
    • -86
    • +58
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Adjustments to graph, grades and sequence layout

    • -27
    • +15
    /lams_central/web/css/components.css
    • -31
    • +28
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -66
    • +59
    /lams_monitoring/web/css/components-monitoring.css
    • -86
    • +58
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Remove unnecessary nested wrapper

    • -8
    • +77
    /lams_central/web/css/components.css
    • -101
    • +25
    /lams_monitoring/web/css/components-monitoring.css
    • -114
    • +114
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Remove unnecessary nested wrapper

    • -8
    • +77
    /lams_central/web/css/components.css
    • -101
    • +25
    /lams_monitoring/web/css/components-monitoring.css
    • -114
    • +114
    /lams_monitoring/web/monitor5.jsp
LDEV-4917 Don't use JS lambdas as JS Compressor does not understand them

Merge branch 'LDEV-5091' into v4.0

LDEV-5091 Initialise Etherpads on Discussion panel expand

    • -6
    • +17
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -6
    • +17
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
  1. … 22 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java

Merge branch 'LDEV-5090'

LDEV-5090 Use "-" char when displaying blank Essay answer

LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Conflicts:

lams_central/web/css/components.css

lams_monitoring/web/WEB-INF/tlds/lams/lams.tld

    • -0
    • +619
    /lams_central/web/css/components.css
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    /lams_monitoring/web/WEB-INF/tags/Input.tag
    • -0
    • +29
    /lams_monitoring/web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    /lams_monitoring/web/WEB-INF/tags/Panel.tag
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Switch.tag
    • -197
    • +36
    /lams_monitoring/web/css/components-monitoring.css
    • -11
    • +14
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Refactor sidebar and top menu. Add custom tags.

    • -55
    • +145
    /lams_central/web/css/components.css
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    /lams_monitoring/web/WEB-INF/tags/Input.tag
    • -0
    • +29
    /lams_monitoring/web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    /lams_monitoring/web/WEB-INF/tags/Panel.tag
    • -0
    • +40
    /lams_monitoring/web/WEB-INF/tags/Switch.tag
    • -197
    • +36
    /lams_monitoring/web/css/components-monitoring.css
    • -11
    • +14
    /lams_monitoring/web/monitor5.jsp
LDEV-5083 Add non-standard fonts

    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    /lams_central/web/includes/fonts/mont-semibold.ttf
    • -3
    • +3
    /lams_monitoring/web/css/components-monitoring.css
LDEV-5083 Add non-standard fonts

    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    /lams_central/web/includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    /lams_central/web/includes/fonts/mont-semibold.ttf
    • -3
    • +3
    /lams_monitoring/web/css/components-monitoring.css