lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4921 Hide question titles in Learner for MCQ

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

    • -0
    • +38
    /lams_tool_lamc/web/admin/config.jsp
LDEV-4921 Add question numbering in Scratchie

LDEV-4921 Allow hiding question titles in Learner for Scratchie

    • -243
    • +244
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +6
    /lams_tool_scratchie/web/pages/admin/config.jsp
LDEV-4887 QTI import done within TBL template

Merge branch 'LDEV-4920' into LDEV-4745

LDEV-4920 Import QTI questions to Assessment after adding them to QB

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

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

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

# lams_monitoring/conf/language/lams/ApplicationResources.properties

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

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

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

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

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

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

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

# lams_tool_images/conf/language/lams/ApplicationResources.properties

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

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

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

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

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

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

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

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

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

  1. … 21 more files in changeset.
Merge branch 'LDEV-4918'

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

LDEV-4918 Collapsible subcourses

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

  1. … 108 more files in changeset.
LDEV-4911 Adding ides to test monitor starting new lesson

    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
LDEV-4769 updating labels

Greek and Norwegian

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Merge branch 'master' into develop

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources_no_NO.properties

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java

Merge branch 'LDEV-4913'

LDEV-4913 Include a minimum number of files to submit

* Improve learner jsp layout

    • -56
    • +120
    /lams_tool_sbmt/web/authoring/advance.jsp
    • -213
    • +199
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
    • -0
    • +138
    /lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp
LKC-228 Fix QTI import when question has multiple images

Merge branch 'master' into LDEV-4915

LDEV-4898 Fix race condition when generating a LD SVG

    • -12
    • +20
    /lams_central/web/includes/javascript/addLesson.js
Merge branch 'LDEV-4916'

LDEV-4916 Fix resizing images saved in CMYK/ICC/unsupported color space

LDEV-4916 Add meaningful errors image gallery upload errors

LDEV-4916 Static fields can not be autowired

Spring does not support it.

LDEV-4860 Grey out labels for disabled checkboxes

LDEV-4860 Fix matching pairs excel export

LDEV-4769 Updating labels

Updating Norwegian

LDEV-4861 Prevent adding the same question twice