lams_monitoring

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

    • -0
    • +561
    ./conf/language/lams/ApplicationResources_pt_PT.properties
  1. … 300 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

    • -8
    • +8
    ./web/includes/javascript/monitorLesson.js
  1. … 27 more files in changeset.
LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

    • -4
    • +3
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -3
    • +3
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 2088 more files in changeset.
LDEV-5440 Do not use deprecated constructors of Double and Boolean

  1. … 34 more files in changeset.
LDEV-5440 Reintroduce more strict security rules in web.xml

  1. … 38 more files in changeset.
LDEV-5440 Replace deprecated Long constructor

  1. … 115 more files in changeset.
LDEV-5440 Fix file uploads

  1. … 38 more files in changeset.
LDEV-5440 Fix multipart config in web.xml files

  1. … 35 more files in changeset.
LDEV-5440 Update web.xml version

  1. … 40 more files in changeset.
LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/permittedTaglibs.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/jstl/scriptfree.tld
  1. … 218 more files in changeset.
LDEV-5083 Don't show lesson status changer if it was Removed

    • -2
    • +4
    ./web/includes/javascript/monitorLesson.js
LDEV-5200 Prevent 4th learner icon from going under counter circle

    • -1
    • +1
    ./web/includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

  1. … 13 more files in changeset.
LDEV-5397 Updating labels Greek, Spanish

  1. … 5 more files in changeset.
LDEV-5424 introduce new variation of monitoring interface. Assessment tool

  1. … 7 more files in changeset.
LDEV-5436 Add comma in usernames in various places

    • -5
    • +3
    ./web/includes/javascript/monitorLesson.js
  1. … 2 more files in changeset.
LDEV-5397 Updating labels Greek, Spanish, English

  1. … 19 more files in changeset.
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

    • -2
    • +2
    ./web/includes/javascript/monitorLesson.js
  1. … 31 more files in changeset.
LDEV-5436 Use comma as name separator

Also fix names in few other places.

  1. … 7 more files in changeset.
LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

    • -12
    • +35
    ./web/WEB-INF/tags/PageMonitor.tag
    • -4
    • +7
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 61 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

    • -3
    • +6
    ./web/includes/javascript/monitorLesson.js
  1. … 12 more files in changeset.
LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 52 more files in changeset.
LDEV-5424 wrap timelimit widget with an accordion

  1. … 1 more file in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

  1. … 61 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

  1. … 85 more files in changeset.
LDEV-5440 Use WF 31 Final instead of Beta

  1. … 70 more files in changeset.
LDEV-5424 improvements to TBL monitor pages

    • -3
    • +2
    ./web/tblmonitor/teamsQuestionResults.jsp
  1. … 1 more file in changeset.
LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

  1. … 1 more file in changeset.
LDEV-4601 Fix lesson scheduling

    • -3
    • +6
    ./web/includes/javascript/monitorLesson.js
LDEV-5096 Move Close Gate button up

Some teachers think it is a Close Dialog button and get confused.