Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5002 changes in labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-5009 Add student's choices table to Assessment regular monitor

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 4 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

    • -1
    • +2
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-4961 Adding missing label

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

    • -2
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +30
    ./lams/ApplicationResources_no_NO.properties
LDEV-4739 updating Greek and Norwegian

    • -2
    • +8
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +30
    ./lams/ApplicationResources_no_NO.properties
LDEV-4961 Export Assessment confidence levels

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4951 Migrate MCQ tool to Assessment

    • -0
    • +12
    ./lams/ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4944 Take care about VSAs edited by several teachers simultaneously

    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4745 LDEV-4875 Adding/updating labels

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

    • -2
    • +7
    ./lams/ApplicationResources.properties
    • -2
    • +7
    ./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
    • +16
    ./lams/ApplicationResources.properties
  1. … 17 more files in changeset.
LDEV-4745 adding new labels

    • -15
    • +13
    ./lams/ApplicationResources.properties
    • -2
    • +25
    ./lams/ApplicationResources_el_GR.properties
    • -12
    • +13
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 updating labels

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

    • -2
    • +16
    ./lams/ApplicationResources.properties
    • -2
    • +25
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +16
    ./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
    ./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

    • -1
    • +10
    ./lams/ApplicationResources.properties
    • -16
    • +74
    ./lams/ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4786 Add missing labels

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

    • -0
    • +6
    ./lams/ApplicationResources.properties
  1. … 13 more files in changeset.
LDEV-4769 updating labels

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

    • -2
    • +10
    ./lams/ApplicationResources.properties
    • -2
    • +10
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    ./lams/ApplicationResources_es_ES.properties
  1. … 120 more files in changeset.
LDEV-4769 Updating labels

Norgewian and Greek

    • -4
    • +15
    ./lams/ApplicationResources_no_NO.properties
  1. … 2 more files in changeset.
LDEV-4880 Add confidence level variations

    • -1
    • +8
    ./lams/ApplicationResources_en_AU.properties
  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

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/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.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/service/AssessmentServiceImpl.java

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 26 more files in changeset.
LDEV-4769 Updating translations

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -4
    • +13
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    ./lams/ApplicationResources_es_ES.properties
LDEV-4859 Include time with dates

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

    • -1
    • +8
    ./lams/ApplicationResources_en_AU.properties
  1. … 75 more files in changeset.
LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

    • -1
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 14 more files in changeset.