lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5391 Move cluster building logic to core for other tools to use

Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

LAI-5 Add more Greek i18n labels

LDEV-5345 Adding and updating latest translations

Big refactoring of labels in Lokalise. Redundant keys for tools are not all based out of lams_noticeboard to ensure that most reused labels have a single reference point.

Added Italian for a whole lot of tools -including monitor and assessment

  1. … 215 more files in changeset.
LAI-5 Add more Greek i18n labels

LDEV-5345 Adding and updating latest translations

  1. … 163 more files in changeset.
Merge branch 'v4.7' into LAI-5

Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

    • -7
    • +11
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -7
    • +11
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -7
    • +11
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -24
    • +35
    /lams_tool_doku/web/pages/authoring/advance.jsp
  1. … 24 more files in changeset.
LDEV-5357 Fix redirect with HTTP when HTTPS is used

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

LDEV-5357 Fix zipped website displaying after introducing UUIDs

LDEV-5389 Fix Peer Review group sorting in monitoring

Groups with different prefixes but same numbers were mistakenly considered equal.

Merge branch 'LDEV-5403' into v4.7

LDEV-5403 Remove YUI compressor

Merge branch 'LDEV-5402' into v4.7

LDEV-5402 Display path to Learning Design in authoring

    • -864
    • +871
    /lams_monitoring/web/monitor.jsp
LDEV-5401 Fix timer display on monitoring Dashboard

LDEV-5338 Remove test code

LDEV-5338 Make unassigned learners box scrollable in grouping view

LDEV-5010 Make labels more clear in Peer Review export

LDEV-5338 Make unassigned learners box scrollable in grouping view

    • -289
    • +294
    /lams_central/web/includes/javascript/groups.js
LDEV-5338 Make group boxes align to top when list of learners is long

    • -136
    • +136
    /lams_central/web/groups.jsp
LDEV-5213 Use version-dependent imports for LAMS JS files

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Page5.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Page5.tag
    • -2
    • +2
    /lams_central/web/authoringConfirm.jsp
  1. … 324 more files in changeset.
LAI-5 Add learning outcomes generation

LDEV-3765 Fortify command websocket code

Make it less prone to random websocket errors.

LDEV-3765 Fortify command websocket code

Make it less prone to random websocket errors.

LAI-5 Store generated RAT question samples in session for further processing

Merge branch 'v4.7' into LAI-5

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

Merge branch 'LDEV-5401' into v4.7

# Conflicts:

# lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java

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