lams_tool_lamc

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

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

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

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

    • -2
    • +2
    ./web/authoring/candidateAnswersList.jsp
  1. … 3 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

    • -2
    • +2
    ./web/authoring/candidateAnswersList.jsp
  1. … 51 more files in changeset.
LDEV-4745 Use correct Set class for sorting MCQ questions

LDEV-4745 Sort QB questions using display order when fetching from DB

  1. … 2 more files in changeset.
LKC-236 Return questions replaced in tool for further processing

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

  1. … 6 more files in changeset.
LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

  1. … 41 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!!

    • -257
    • +246
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -257
    • +246
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -257
    • +246
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -289
    • +185
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -241
    • +246
    ./conf/language/lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

  1. … 5 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 33 more files in changeset.
LDEV-5054 Fix Learning Outcome removal Ajax call

  1. … 31 more files in changeset.
LDEV-4847 Fix importing QB question with existing UUID

  1. … 7 more files in changeset.
LKC-213 Fix a bug when adding questions to MCQ from WA

LDEV-4886 Automated tests for v4.0

  1. … 18 more files in changeset.
LDEV-5025 Allow leaving comments even after user rated

  1. … 31 more files in changeset.
LDEV-4925 Fix new lines on learner results page in Peer Review

  1. … 31 more files in changeset.
LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 34 more files in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
LDEV-5030 Sanitise user names for initial Etherpad content

  1. … 32 more files in changeset.
LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

  1. … 32 more files in changeset.
LDEV-4996 Adjust Etherpad autogrow feature

  1. … 31 more files in changeset.
LDEV-4997 Renormalize line endings with git

    • -145
    • +145
    ./web/tblmonitoring/mcqStudentChoices.jsp
  1. … 419 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

  1. … 23 more files in changeset.
LDEV-5014 Add spinner while QB panel loads in authoring

  1. … 3 more files in changeset.
LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

  1. … 32 more files in changeset.
LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

  1. … 32 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -228
    • +228
    ./web/monitoring/parts/statsPart.jsp
    • -150
    • +150
    ./web/tblmonitoring/mcqStudentChoices.jsp
  1. … 461 more files in changeset.