lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4537 Add Peer Review tab to TBL monitoring

    • -0
    • +62
    /lams_monitoring/web/tblmonitor/peerreview.jsp
LDEV-4293 Clear login mapping even if user DTO is not present

LDEV-4293 Clear login mapping even if user DTO is not present

LDEV-4501 Remove obsolete log formatter

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

    • -23
    • +0
    /lams_build/conf/slim/standalone.xml
    • binary
    /lams_build/lib/lams/lams-central.jar
  1. … 69 more files in changeset.
LDEV-4533 Exception details are hidden as per system config

    • -0
    • +2
    /lams_central/web/errorpages/error.jsp
    • -7
    • +17
    /lams_tool_assessment/web/error.jsp
  1. … 20 more files in changeset.
LDEV-4532 Opening collapsable panels no longer makes screen jump

LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

LDEV-4532 Burning Questions accessible on iPad

Redid change obscured by merge.

Merge branch 'LDEV-4530' with scratchies shown in learner results page

Conflicts with LDEV-4532

lams_tool_scratchie/web/pages/learning/questionlist.jsp

LDEV-4530 Control in authoring whether scratchies are shown in results

LDEV-4530 Display scratchie results in learner interface

Till now only monitor could view it.

    • -0
    • +97
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
LDEV-4531 Essay Question displays 8 rows for text entry

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

LDEV-4529 Notification lesson list restricted on Monitor access

LDEV-4528 Empty Courses can only have not started notifications

LDEV-4402 Update MySQL connector source files

  1. … 13 more files in changeset.
LDEV-4402 Upgrade MySQL connector so it works with server 8.0.3+

    • binary
    /lams_build/deploy-tool/lib/mysql-connector-java-5.1.46-bin.jar
    • binary
    /lams_build/lib/mysql/mysql-connector-java-5.1.43-bin.jar
    • binary
    /lams_build/lib/mysql/mysql-connector-java-5.1.46-bin.jar
LDEV-4527: Added Portraits to Learner Search screen

LDEV-4526: Email calculations support learners with no ratings.

LDEV-4525 Fixed Reflection issues

LDEV-4524 Monitoring Task Item List loads correctly

This screen also missed being bootstrapped so the layout is

updated. Also fixed a bug that stopped the Task Item list loading

for a learner entered task if the Monitor had gone into Edit

Activity and saved the activity.

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 20 more files in changeset.
Merge branch 'LDEV-4523'

LDEV-4523 Tools remove mark rather than clear it on user content delete

LDEV-4523 Add method to remove actitivy mark

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

    • -0
    • +21
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles-defs.xml
LDEV-4501 Debugging removed for merge to master.

Merge branch 'LDEV-4520'