lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

  1. … 10 more files in changeset.
LDEV-5024 fixing label

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

    • -1066
    • +1076
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    ./conf/security/Owasp.CsrfGuard.properties
    • -36
    • +110
    ./web/questions/questionFile.jsp
  1. … 19 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-4917 Add error pop up on attempt of uploading incorrect file

  1. … 7 more files in changeset.
LDEV-5063 Do not allow empty weights in Learning Design authoring

If a weight is empty, it is filled with 0. If all weights are 0, the

Learning Design is considered non-weighted.

LDEV-4917 Minor adjustments to existing Uppy uploads

  1. … 2 more files in changeset.
LDEV-4917 Add Uppy file uploads to XML question import

LDEV-4917 Add Uppy file uploads to QTI question import

    • -45
    • +105
    ./web/questions/questionFile.jsp
  1. … 3 more files in changeset.
LDEV-4917 Remove unnecessary label in LD import in authoring

LDEV-4917 Allow only .zip files for LD import in authoring

LDEV-4769 Updating English , Spanish, Norwegian

  1. … 5 more files in changeset.
LDEV-4769 Updating Spanish

LDEV-4917 Add Uppy upload to Learning Desing zip import in authoring

  1. … 1 more file in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

  1. … 40 more files in changeset.
LDEV-5059 Add Norwegian i18n for jqGrid

    • -0
    • +99
    ./web/includes/javascript/jqgrid-i18n/grid.locale-no.js
LDEV-5059 Add central i18n for jqGrid

    • -0
    • +182
    ./web/includes/javascript/jqgrid-i18n/grid.locale-el.js
    • -0
    • +186
    ./web/includes/javascript/jqgrid-i18n/grid.locale-es.js
    • -0
    • +182
    ./web/includes/javascript/jqgrid-i18n/grid.locale-fr.js
    • -0
    • +25
    ./web/jqGrid.i18n.jsp
  1. … 4 more files in changeset.
LDEV-4769 Updating Spanish, Norwegian

  1. … 6 more files in changeset.
LDEV-5059 Add missing labels for Question Bank

    • -4
    • +4
    ./web/qb/authoring/addmultiplechoice.jsp
LDEV-4917 Fix CKEditor upload successful message

LDEV-4917 Clean up tmp uploaded files when they are no longer needed

  1. … 3 more files in changeset.
Updating labels Spanish, English, French, Norwegian

  1. … 41 more files in changeset.
LDEV-4917 Add i18n to Uppy instance

    • -0
    • +2
    ./web/includes/javascript/uppy/el_GR.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/es_ES.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/fr_FR.min.js
    • -0
    • +2
    ./web/includes/javascript/uppy/uppy.min.js
  1. … 3 more files in changeset.
LDEV-4769 Updating Spanish, Norwegian

  1. … 3 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

LDEV-4769 Updating Spanish

Also removing a deprecated label

  1. … 20 more files in changeset.
LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

    • -0
    • +11
    ./web/css/uppy.min.css
    • -0
    • +2
    ./web/includes/javascript/uppy.min.js
  1. … 15 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

  1. … 21 more files in changeset.
LDEV-5058 Move activity category from DB to authoring front end

  1. … 8 more files in changeset.
LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

    • -1089
    • +1062
    ./conf/language/lams/ApplicationResources.properties
    • -1066
    • +1063
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    ./conf/language/lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.