Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5091 Etherpad.tag to accept predefined pad ID

  1. … 31 more files in changeset.
LKC-216 Remove obsolete test code

LDEV-5095 Add latest chart.js to the project

We already use an old version of this library in other places in LAMS.

    • -0
    • +7
    ./includes/javascript/chart.bundle.min.js
LDEV-5083 Add latest version of chart.js

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

    • -0
    • +7
    ./includes/javascript/chart.bundle.min.js
  1. … 1 more file in changeset.
LDEV-5083 Adjustments to graph, grades and sequence layout

  1. … 3 more files in changeset.
LDEV-5083 Adjustments to graph, grades and sequence layout

  1. … 3 more files in changeset.
LDEV-5083 Remove unnecessary nested wrapper

  1. … 2 more files in changeset.
LDEV-5083 Remove unnecessary nested wrapper

  1. … 2 more files in changeset.
LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 36 more files in changeset.
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
    ./css/components.css
  1. … 8 more files in changeset.
LDEV-5083 Refactor sidebar and top menu. Add custom tags.

  1. … 8 more files in changeset.
LDEV-5083 Add non-standard fonts

    • binary
    ./includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    ./includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    ./includes/fonts/mont-semibold.ttf
  1. … 1 more file in changeset.
LDEV-5083 Add non-standard fonts

    • binary
    ./includes/fonts/FontsFree-Net-Mont-Bold.ttf
    • binary
    ./includes/fonts/FontsFree-Net-Mont1.ttf
    • binary
    ./includes/fonts/mont-semibold.ttf
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

  1. … 31 more files in changeset.
LDEV-4425 Do not escape user names. Add padding to portrait.

  1. … 31 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

    • -0
    • +1
    ./css/components-timeline.css
    • binary
    ./images/components/001.png
    • -0
    • +8
    ./images/components/001.svg
    • binary
    ./images/components/002.png
    • binary
    ./images/components/003.png
    • binary
    ./images/components/004.png
    • -0
    • +4
    ./images/components/cd-icon-location.svg
    • -0
    • +4
    ./images/components/cd-icon-movie.svg
    • -0
    • +5
    ./images/components/cd-icon-picture.svg
    • binary
    ./images/components/icon1.png
    • binary
    ./images/components/icon2.png
    • binary
    ./images/components/img2.png
    • binary
    ./images/components/star.png
  1. … 5 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

    • -0
    • +1
    ./css/components-timeline.css
    • binary
    ./images/components/001.png
    • -0
    • +8
    ./images/components/001.svg
    • binary
    ./images/components/002.png
    • binary
    ./images/components/003.png
    • binary
    ./images/components/004.png
    • -0
    • +4
    ./images/components/cd-icon-location.svg
    • -0
    • +4
    ./images/components/cd-icon-movie.svg
    • -0
    • +5
    ./images/components/cd-icon-picture.svg
    • binary
    ./images/components/icon1.png
    • binary
    ./images/components/icon2.png
    • binary
    ./images/components/img2.png
    • binary
    ./images/components/star.png
  1. … 5 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

LDEV-5084 Identify the button to disable correctly

Merge remote-tracking branch 'origin/master' into v4.0

  1. … 1 more file in changeset.
LDEV-5084 Disable Save button on LTI lesson create

Fetching memberships can take a while and an user can double click the

button.

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java

  1. … 2 more files in changeset.
LDEV-5084 Allow custom membership URL in LTI calls

  1. … 4 more files in changeset.
LDEV-5081 Make boostrap panels lighter

LDEV-5081 Apply correct redesigned CSS for bootstrap table

  1. … 2 more files in changeset.
LDEV-5081 Apply correct redesigned CSS for Free jqGrid

    • -0
    • +124
    ./css/free.ui.jqgrid.custom.css
    • -1851
    • +0
    ./css/free.ui.jqgrid.min5.css
LDEV-5080 Refactor new design CSS file

  1. … 4 more files in changeset.