ApplicationResources.properties

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5041 Add absolute time limit feature to Assessment

  1. … 10 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

  1. … 6 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

  1. … 1 more file in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

  1. … 1 more file in changeset.
LDEV-5025 Show detailed answer ratings in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5025 Show rating for the given team's own answer

  1. … 1 more file in changeset.
LDEV-5025 Allow Assessment other groups' answer rating and commenting

  1. … 11 more files in changeset.
LDEV-5002 changes in labels

  1. … 1 more file in changeset.
LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

  1. … 3 more files in changeset.
LDEV-5009 Add student's choices table to Assessment regular monitor

  1. … 4 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

  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. … 6 more files in changeset.
LDEV-4961 Adding missing label

  1. … 1 more file in changeset.
LDEV-4961 Export Assessment confidence levels

  1. … 1 more file in changeset.
LDEV-4745 LDEV-4875 Adding/updating labels

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

  1. … 5 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

  1. … 17 more files in changeset.
LDEV-4745 adding new labels

    • -15
    • +13
    ./ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4769 updating labels

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

  1. … 65 more files in changeset.
LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

  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. … 11 more files in changeset.
LDEV-4786 Add missing labels

  1. … 2 more files in changeset.
LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

  1. … 13 more files in changeset.
LDEV-4769 updating labels

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

  1. … 122 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

  1. … 27 more files in changeset.
LDEV-4769 Updating translations

  1. … 3 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -358
    • +359
    ./ApplicationResources.properties
  1. … 50 more files in changeset.