lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5200 Fix learner search and search clear

LDEV-5200 Add completed activities and lesson info on learners tab

    • -0
    • +4
    /lams_monitoring/web/css/components-monitoring.css
    • -4
    • +10
    /lams_monitoring/web/monitor-learners-tab.jsp
Merge branch 'LDEV-5351' into v4.6

LDEV-5351 Use Boostrap tooltips instead of plain HTML titles

Merge branch 'LDEV-5350' into v4.6

LDEV-4601 Modify date format for scheduling lesson start and end

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

LDEV-5352 Slightly improve UI

LDEV-5352 Use colours in question column, not in options columns

LDEV-5350 Fix issue with detecting groupings in LD

LDEV-5324 Allow creating essay questions new versions

    • -0
    • +4
    /lams_central/web/qb/authoring/addessay.jsp
Merge branch 'LDEV-5352' into v4.7

LDEV-5352 Add traffic lights colours to iRAT students' choices table

LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

    • -0
    • +20
    /lams_central/web/includes/javascript/addLesson.js
LDEV-5350 Add grouping preview and group count to Add Lesson dialog

    • -0
    • +16
    /lams_central/web/includes/javascript/addLesson.js
LDEV-5351 Add marking teacher front end

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.