Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5200 Use more general approach to calculate a shape box in SVG

LDEV-5200 Use path replacement rather than removal & creation

    • -13
    • +19
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5016 Use path replacement rather than removal & creation

    • -13
    • +19
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5016 Draw bezier curves for transitions in LD authoring

    • -64
    • +119
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5200 Draw bezier curves for transitions in LD authoring

    • -64
    • +119
    ./includes/javascript/authoring/authoringActivity.js
LDEV-5061 Upgrade snap.svg to 0.5.1 version

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

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

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

    • -14
    • +15
    ./includes/javascript/authoring/authoringGeneral.js
  1. … 3 more files in changeset.
LDEV-4917 Add error pop up on attempt of uploading incorrect file

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

    • -14
    • +15
    ./includes/javascript/authoring/authoringGeneral.js
LDEV-4917 Minor adjustments to existing Uppy uploads

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

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

  1. … 4 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-4917 Add Uppy upload to Learning Desing zip import in authoring

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

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

    • -0
    • +182
    ./includes/javascript/jqgrid-i18n/grid.locale-el.js
    • -0
    • +186
    ./includes/javascript/jqgrid-i18n/grid.locale-es.js
    • -0
    • +182
    ./includes/javascript/jqgrid-i18n/grid.locale-fr.js
  1. … 4 more files in changeset.
LDEV-5059 Add missing labels for Question Bank

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

    • -0
    • +2
    ./includes/javascript/uppy/el_GR.min.js
    • -0
    • +2
    ./includes/javascript/uppy/es_ES.min.js
    • -0
    • +2
    ./includes/javascript/uppy/fr_FR.min.js
    • -0
    • +2
    ./includes/javascript/uppy/uppy.min.js
  1. … 3 more files in changeset.
LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

    • -0
    • +2
    ./includes/javascript/uppy.min.js
  1. … 16 more files in changeset.
LDEV-5058 Move activity category from DB to authoring front end

  1. … 11 more files in changeset.
LDEV-5055 Make colour of correct option change progressively

LDEV-5055 Use letters instead of numbers for all question types

LDEV-5055 Colour display order circle for a correct option

LDEV-5055 Use letters instead of numbers for options in authoring

LDEV-5055 Do not set auto title nor aria-label attributes to CKEditor

LDEV-5054 Fix Learning Outcome removal Ajax call

  1. … 31 more files in changeset.
LDEV-5050 Make all TBL template questions required

    • -3
    • +0
    ./authoring/template/tool/assessmcq.jsp
    • -2
    • +0
    ./authoring/template/tool/assessment.jsp
    • -2
    • +0
    ./authoring/template/tool/mcquestion.jsp
  1. … 3 more files in changeset.