lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Updating labels Greek, Spanish

LAI-9 Add PBL activity templates internationalisation

LAI-9 Hide "AI review all" button when if are no learners' results yet

LDEV-5219 Make "stop at preceding activity" gate option ON by default

Also hide it for most other gates as it makes more sense for learners to access the gate itself.

    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
Merge branch 'LAI-9' into v4.8

# Conflicts:

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

# lams_tool_doku/web/pages/monitoring/summary.jsp

LAI-9 Add AI reviews to main AE monitoring screen

LDEV-5424 introduce new variation of monitoring interface. Assessment tool

LDEV-5436 Add comma in usernames in various places

LDEV-5397 Updating labels Greek, Spanish, English

  1. … 5 more files in changeset.
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

    • -1
    • +1
    /lams_learning/web/grouping/choose.jsp
    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
  1. … 20 more files in changeset.
LDEV-5436 Use comma as name separator

Also fix names in few other places.

LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 12 more files in changeset.
LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

    • -12
    • +35
    /lams_admin/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_gradebook/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_learning/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_monitoring/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag
  1. … 48 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

LDEV-5445 Assessment learning. Fix mode=teaher for situations when leader hasn't committed his response yet

Merge branch 'LAI-11' into v4.8

LDEV-5200 Fix branching arranging in authoring

LDEV-5397 improve Submit Files learning's UI

LDEV-5397 force card-header's text (even if it has some rich text formatting) to follow this card-header's color theme

Merge branch 'LDEV-5445' into v4.8

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

    • -9
    • +11
    /lams_gradebook/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_learning/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_monitoring/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
    • -34
    • +36
    /lams_tool_doku/web/pages/learning/learning.jsp
  1. … 38 more files in changeset.
LDEV-3115 Fix group creation on LD save in authoring

Merge branch 'LDEV-5449' into v4.8

LDEV-5449 Add "allow answer rating" option in learning

LDEV-5449 Add "allow answer rating" option in authoring

LDEV-5446 Do initial indexing before fixing duplicate UUIDs

Otherwise searching for duplicate UUIDs takes too long.

LDEV-3115 Fix group removal on LD save in authoring

It seems that Hibernate does not like having entities violating unique keys in one collection. Even for a while and even though afterward the collection contains only unique entities.

    • -3
    • +2
    /lams_central/web/css/_authoring_base.scss
LAI-11 Add AI PBL wizard

Refactor code of other AI wizards.

    • -0
    • +57
    /lams_central/web/templates/pbl/aiPblAnalysisContentTemplate.html
    • -0
    • +21
    /lams_central/web/templates/pbl/aiPblAnalysisDocumentTemplate.html
    • -0
    • +15
    /lams_central/web/templates/pbl/aiPblDiscussionContentTemplate.html
    • -0
    • +13
    /lams_central/web/templates/pbl/aiPblDiscussionDocumentTemplate.html
    • -0
    • +14
    /lams_central/web/templates/pbl/aiPblIntroductionTemplate.html
    • -0
    • +8
    /lams_central/web/templates/pbl/aiPblProblemTemplate.html
    • -0
    • +9
    /lams_central/web/templates/pbl/aiPblReportTemplate.html
    • -0
    • +23
    /lams_central/web/templates/pbl/aiPblResearchTemplate.html
LDEV-5448 properly remove HTML tags produced by CKEditor

LDEV-5397 force card-header's text (even if it has some rich text formatting) to follow this card-header's color theme