lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5330 adding font-awesome6 to web.xml

LDEV-5351 Add marking teacher model

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

LDEV-5345 Updating Greek

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

    • -105
    • +94
    /lams_central/web/includes/javascript/groups.js
    • -1
    • +15
    /lams_monitoring/web/WEB-INF/web.xml
LDEV-4457 Remove empty groups after spreadsheet import

LDEV-3119 Any org super user can edit course groupings

Till now only Course Manager could edit Course Groupings. It is an

unnecessary limitation. Plus integrations set only monitor and author

roles in course, never course manager. And some universities would like

to be able to work with course groupings.

    • -103
    • +92
    /lams_central/web/includes/javascript/orgGroup.js
    • -1
    • +15
    /lams_monitoring/web/WEB-INF/web.xml
LDEV-5200 Add paging to learners tab in monitoring

LDEV-5200 Add paging to learners tab in monitoring

    • -2
    • +27
    /lams_monitoring/web/monitor-learners-tab.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5345 Updating English, Spanish, Greek

  1. … 8 more files in changeset.
Merge branch 'LDEV-5349' into v4.6

LDEV-5349 Reintroduce zipped website as Shared Resource

    • -1
    • +3
    /lams_tool_larsrc/web/pages/authoring/basic.jsp
    • -0
    • +108
    /lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
  1. … 3 more files in changeset.
LDEV-5200 Fix encoding in Assessment chart

LDEV-5200 Update Bootstrap to 5.2.3

It also addresses Sass warnings for missing units.

    • -1
    • +1
    /lams_central/web/css/bootstrap/_alert.scss
    • -3
    • +1
    /lams_central/web/css/bootstrap/_badge.scss
    • -9
    • +58
    /lams_central/web/css/bootstrap/_buttons.scss
    • -1
    • +1
    /lams_central/web/css/bootstrap/_modal.scss
    • -3
    • +3
    /lams_central/web/css/bootstrap/_nav.scss
    • -0
    • +4
    /lams_central/web/css/bootstrap/_navbar.scss
  1. … 25 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-4853 Open LD tree view folder on click on its label too

LDEV-5200 Fix encoding in Assessment chart

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/web/includes/javascript/monitorLesson.js

LDEV-3167 Stop monitor refresh when user logged out

LDEV-3171 Remove Peer Review ratings on force uncomplete

Merge branch 'LDEV-5347' into v4.7

LDEV-5347 Add Flux update to Burning Questions tab

Also indicate when there are no burning questions yet.

LDEV-5200 Display and allow copying lesson URL

    • -0
    • +6
    /lams_monitoring/web/css/components-monitoring.css
LDEV-5200 Add proper padding to larger learner content

Before the patch it overlapped with progress bar on the left.

    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
  1. … 18 more files in changeset.
LDEV-5200 In Learners tab do not open activity pop up for gates

Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5342 Show LD last modified date also in Save As dialog

LDEV-4497 Make sure "ad" word is never a part of content folder ID

UUIDs are cut into folders of two characters and used in image paths.

AdBlock can block an image if there is "ad" in its path. Just make sure

this path piece never occurs.