lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
LDEV-5083 Add redesign CSS files otherwise ignored by git

    • -0
    • +107
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -0
    • +1078
    /lams_monitoring/web/css/components-monitoring.css
LDEV-5083 Add redesign CSS files otherwise ignored by git

    • -0
    • +107
    /lams_monitoring/web/css/components-monitoring-responsive.css
    • -0
    • +1078
    /lams_monitoring/web/css/components-monitoring.css
Merge branch 'LDEV-5089' into v4.0

LDEV-5089 Prevent scratching until Ajax response is received

Merge branch 'LDEV-5087' into v4.0

LDEV-5087 Do not show question title on Assessment results screen

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

    • -4
    • +3
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 17 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.

    • -4
    • +2
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 17 more files in changeset.
LDEV-4425 Do not escape user names. Add padding to portrait.

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

    • -21
    • +25
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -21
    • +25
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  1. … 17 more files in changeset.
Merge branch 'LDEV-5085'