lams_monitoring

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

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

Also removing a deprecated label

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

    • -482
    • +476
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -482
    • +476
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -482
    • +471
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -304
    • +263
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -482
    • +476
    ./conf/language/lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 33 more files in changeset.
LDEV-5031 Do not auto refresh AEs Student Choices tab

LDEV-5031 Do not auto refresh AEs and Burning Questions tabs

LDEV-5054 Fix Learning Outcome removal Ajax call

  1. … 31 more files in changeset.
Merge branch 'v4.0' into LDEV-4886

    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5038 Add group to user name in lesson monitor sequence tab

    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-4886 Automated tests for v4.0

    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  1. … 16 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-5031 Refresh last TBL tab content. Periodic refresh.

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-5023 Changing buttons to dropdown menu as it looks better.

Of course, in my humble opinion :-)

    • -7
    • +9
    ./web/includes/javascript/monitorLesson.js
LDEV-5023 Fix a missing variable in JS

    • -1
    • +2
    ./web/includes/javascript/monitorLesson.js
LDEV-5023 Allow single click gate open in monitoring

    • -7
    • +37
    ./web/includes/javascript/monitorLesson.js
LDEV-4997 Renormalize line endings with git

    • -440
    • +440
    ./web/tblmonitor/teams.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

    • -440
    • +440
    ./web/tblmonitor/teams.jsp
  1. … 30 more files in changeset.
LDEV-4995 First draft of the monitor page

    • -10
    • +159
    ./web/css/_monitorLesson_base.scss
    • -51
    • +174
    ./web/includes/javascript/monitorLesson.js
  1. … 7 more files in changeset.
LDEV-4995 update tags

    • -0
    • +105
    ./web/WEB-INF/tags/Widget.tag
  1. … 8 more files in changeset.
LDEV-4995 fix exception thrown on trying to get activity's Id

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
    • -440
    • +440
    ./web/tblmonitor/teams.jsp
  1. … 461 more files in changeset.