Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4553 Updating labels

    • -5
    • +5
    ./lams/ApplicationResources.properties
    • -5
    • +5
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 1 more file in changeset.
LDEV-4769 Update Norwegian, Spanish, English, Greek, German, French

    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 21 more files in changeset.
LDEV-3115 Fix a typo in i18n label

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
LDEV-3115 Check range conditions correctly

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
LDEV-3115 Check range conditions correctly

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating English, Norwegian and Greek

    • -8
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +0
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    ./lams/ApplicationResources_es_ES.properties
    • -2
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 4 more files in changeset.
LDEV-4510 Allow empty question description fields in TBL template

    • -2
    • +0
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4769 Update Greek

    • -14
    • +16
    ./lams/ApplicationResources_el_GR.properties
  1. … 3 more files in changeset.
LDEV-4769 Fixing quotes for Greek

    • -13
    • +11
    ./lams/ApplicationResources_el_GR.properties
Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -9
    • +12
    ./lams/ApplicationResources_en_AU.properties
  1. … 29 more files in changeset.
LDEV-4769 Updating Greek and Norwegian

    • -11
    • +11
    ./lams/ApplicationResources_el_GR.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating Greek

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 9 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian, Greek

    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 8 more files in changeset.
LDEV-5101 Adding labels from lokalise (English and Español)

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 6 more files in changeset.
Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian, Greek

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +2
    ./lams/ApplicationResources_no_NO.properties
  1. … 16 more files in changeset.
LDEV-5114 Enforce question new version on demand

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating Greek and Norwegian

    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 13 more files in changeset.
LDEV-4949 LDEV-5106 LDEV-5107 LDEV-5108 Adding/updating labels

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_de_DE.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 14 more files in changeset.
LDEV-4769 Updating Greek

    • -4
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 4 more files in changeset.
LDEV-5106 Adding MS Word question import to TBL Template

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 2 more files in changeset.
LDEV-4949 Updating labels for Greek and Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./lams/ApplicationResources_no_NO.properties
LDEV-4769 Updating Greek, Norwegian

    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
LDEV-4949 Updating labels

    • -3
    • +6
    ./lams/ApplicationResources.properties
    • -3
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    ./lams/ApplicationResources_es_ES.properties
LDEV-4769 Updating English, Spanish, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -4
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 9 more files in changeset.
LDEV-4769 Updating Greek

    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating Greek

    • -2
    • +2
    ./lams/ApplicationResources_el_GR.properties
  1. … 6 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

    • -5
    • +5
    ./lams/ApplicationResources_el_GR.properties
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5080

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

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