Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4993 Redesign Scratchie monitoring summary tab

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4987 Show score by each Scratchie in results. Show negative percent

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
LDEV-4986 Updating labels

    • -3
    • +3
    ./language/lams/ApplicationResources.properties
    • -3
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4769 Updating Greek and Norwegian

    • -2
    • +18
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./language/lams/ApplicationResources_no_NO.properties
LDEV-4739 Updating Greek and Norwegian

    • -2
    • +18
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./language/lams/ApplicationResources_no_NO.properties
LDEV-4986 Updating labels

    • -6
    • +22
    ./language/lams/ApplicationResources.properties
    • -6
    • +22
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4986 Lowest score (not zero) is default for unravelled question

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4745 LDEV-4875 Adding/updating labels

Adding and updating labels for QB and VSAs for LAMS v4.0

    • -4
    • +20
    ./language/lams/ApplicationResources.properties
    • -4
    • +20
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

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

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

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

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

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

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

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

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

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

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

# lams_tool_survey/conf/language/lams/ApplicationResources.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_wiki/conf/language/lams/ApplicationResources.properties

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

    • -2
    • +15
    ./language/lams/ApplicationResources.properties
  1. … 17 more files in changeset.
LDEV-4745 adding new labels

    • -15
    • +17
    ./language/lams/ApplicationResources.properties
    • -3
    • +21
    ./language/lams/ApplicationResources_el_GR.properties
    • -12
    • +17
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

    • -2
    • +15
    ./language/lams/ApplicationResources.properties
    • -2
    • +21
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +15
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 63 more files in changeset.
LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

    • -0
    • +3
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

    • -0
    • +6
    ./language/lams/ApplicationResources.properties
    • -23
    • +14
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4921 Allow hiding question titles in Learner for Scratchie

    • -243
    • +244
    ./language/lams/ApplicationResources.properties
  1. … 7 more files in changeset.
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

    • -2
    • +8
    ./language/lams/ApplicationResources.properties
  1. … 35 more files in changeset.
LDEV-4769 updating labels

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

    • -2
    • +9
    ./language/lams/ApplicationResources.properties
    • -2
    • +9
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +9
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 120 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

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

    • -2
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4769 Updating labels

Norgewian and Greek

    • -2
    • +7
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4880 Add confidence level variations

    • -0
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 19 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -2
    • +21
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 75 more files in changeset.
LDEV-4838 Refine import from QB feature

    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 6 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

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

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

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

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

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

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

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

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

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

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

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

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

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

    • -0
    • +2
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 53 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

    • -2
    • +0
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 12 more files in changeset.
LDEV-4825 Display QB stats in Scratchie tool monitoring

    • -237
    • +241
    ./language/lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 86 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 63 more files in changeset.
LDEV-4746 Migrate Scratchie to QB

    • -1
    • +3
    ./language/lams/ApplicationResources.properties
  1. … 31 more files in changeset.
LDEV-4769 Updating Greek

    • -2
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4730 Updating labels for Scratchie

Updating Greek, English and Spanish

    • -6
    • +7
    ./language/lams/ApplicationResources.properties
    • -2
    • +4
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
LDEV-4696 Migrate Scratchie to Hibernate annotations

  1. … 14 more files in changeset.