lams-github

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

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.

    • -22
    • +28
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -22
    • +28
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  1. … 17 more files in changeset.
LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

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

    • -0
    • +1
    /lams_central/web/css/components-timeline.css
    • binary
    /lams_central/web/images/components/001.png
    • -0
    • +8
    /lams_central/web/images/components/001.svg
    • binary
    /lams_central/web/images/components/002.png
    • binary
    /lams_central/web/images/components/003.png
    • binary
    /lams_central/web/images/components/004.png
    • -0
    • +4
    /lams_central/web/images/components/cd-icon-movie.svg
    • binary
    /lams_central/web/images/components/icon1.png
    • binary
    /lams_central/web/images/components/icon2.png
    • binary
    /lams_central/web/images/components/img2.png
    • binary
    /lams_central/web/images/components/star.png
  1. … 3 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

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

LDEV-5084 Disable Save button on LTI lesson create

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

button.

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

Conflicts:

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

Merge branch 'LDEV-5084'

LDEV-5084 Allow custom membership URL in LTI calls

LDEV-5081 Make boostrap panels lighter

    • -0
    • +13
    /lams_central/web/css/components.css
LDEV-5081 Apply correct redesigned CSS for bootstrap table

LDEV-5081 Apply correct redesigned CSS for Free jqGrid

    • -0
    • +124
    /lams_central/web/css/free.ui.jqgrid.custom.css
    • -1851
    • +0
    /lams_central/web/css/free.ui.jqgrid.min5.css
LDEV-5081 Rename file prototypes to real names used in Assessment

    • -0
    • +15
    /lams_tool_assessment/web/pages/authoring/leader.jsp
  1. … 9 more files in changeset.
LDEV-5080 Allow non-collapsible Panel

    • -15
    • +26
    /lams_tool_assessment/web/WEB-INF/tags/Panel.tag
LDEV-5080 Refactor new design CSS file

    • -273
    • +226
    /lams_central/web/css/components.css
LDEV-5081 Simplify authoring grid layout

LDEV-5080 Drop jGrowl in favour of toast for QB question search

    • -12
    • +10
    /lams_central/web/qb/search5.jsp
LDEV-5081 Drop jGrowl in favour of bootstrap toast for question edit

    • -0
    • +12
    /lams_central/web/css/components.css
LDEV-5081 Drop thickbox in favour of bootstrap modal for question edit

    • -0
    • +10
    /lams_central/web/css/components.css
LDEV-5081 Rewrite reflect auto enable code to jQuery

LDEV-5081 Use badges instead of button in question list

Merge branch 'LDEV-5082' into v4.0

LDEV-5082 Make sure that a QB collection name is returned as string

    • -1
    • +1
    /lams_central/web/qb/collectionList.jsp
LDEV-4718 Fix plugin race condition by manually disabling buttons

    • -3
    • +5
    /lams_learning/web/grouping/choose.jsp
LDEV-5081 Rewrite questions table to bootstrap 4.5

LDEV-5080 Rewrite AuthoringButton tag to bootstrap 4.5

    • -0
    • +135
    /lams_tool_assessment/web/WEB-INF/tags/AuthoringButton5.tag