Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4538 Timeago converting gates to relative times

LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

  1. … 12 more files in changeset.
LDEV-4538 Display gate open user and time in monitoring

  1. … 10 more files in changeset.
LDEV-4536 Add portrait pics to teams tabs in TBL monitoring

LDEV-4537 Add Peer Review tab to TBL monitoring

    • -0
    • +62
    ./tblmonitor/peerreview.jsp
  1. … 6 more files in changeset.
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

  1. … 83 more files in changeset.
LDEV-4533 Exception details are hidden as per system config

  1. … 34 more files in changeset.
LDEV-4529 Notification lesson list restricted on Monitor access

    • -2
    • +2
    ./emailnotifications/courseNotifications.jsp
  1. … 1 more file in changeset.
LDEV-4528 Empty Courses can only have not started notifications

    • -0
    • +10
    ./emailnotifications/courseNotifications.jsp
LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

  1. … 13 more files in changeset.
LDEV-4505 Learners identified by Lastname, Surname in Monitoring

    • -2
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 8 more files in changeset.
LDEV-4520 Fix several CSS issues

LKC-89 Move TBL Monitoring interface from lams-private

Add a switch that would display TBL UI monitoring interface. It

should be available only to the TBL template lessons.

Besides, modify the TBL UI monitor as in some cases the iRA (the first

assessment is not only just MCQ, but Assessment). So the change would be

to add as iRA the first assessment activity whether this is MCQ or

assessment.

    • -0
    • +400
    ./css/tblmonitor.scss
    • -0
    • +62
    ./tblmonitor/forum.jsp
    • -0
    • +58
    ./tblmonitor/gates.jsp
    • -0
    • +353
    ./tblmonitor/sequence.jsp
    • -0
    • +289
    ./tblmonitor/tblmonitor.jsp
    • -0
    • +425
    ./tblmonitor/teams.jsp
    • -0
    • +14
    ./template/taglibs.jsp
  1. … 4 more files in changeset.
LKC-89 Avoid JS exception if sequenceInfoDialog is not available

    • -3
    • +4
    ./includes/javascript/monitorLesson.js
LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

  1. … 33 more files in changeset.
LDEV-4421 Comments allowed for authored items in Share Resources

  1. … 65 more files in changeset.
LDEV-4487 Toggle display activity scores option in monitor

    • -0
    • +22
    ./includes/javascript/monitorLesson.js
  1. … 5 more files in changeset.
LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

  1. … 13 more files in changeset.
LDEV-4477 Disable lesson on schedule

    • -22
    • +76
    ./includes/javascript/monitorLesson.js
  1. … 6 more files in changeset.
LDEV-4476: Monitor can change the scheduled start date.

    • -3
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-4484 Print Grouping Page

  1. … 9 more files in changeset.
LDEV-4473 Add bootstrap.js when it's not available on page

  1. … 30 more files in changeset.
LDEV-4457 Create groupings based on file upload

  1. … 15 more files in changeset.
LDEV-4436 Ability to change portrait in learner

  1. … 33 more files in changeset.
LDEV-4459 Add icons to navigation buttons

    • -2
    • +2
    ./emailnotifications/courseNotifications.jsp
    • -2
    • +2
    ./emailnotifications/lessonNotifications.jsp
LDEV-4459 Export archived email notification

    • -1
    • +15
    ./emailnotifications/archivedEmailList.jsp
  1. … 4 more files in changeset.
LDEV-4459 Display a paged list of email notification recipients

    • -7
    • +32
    ./emailnotifications/archivedEmailList.jsp
  1. … 7 more files in changeset.
LDEV-4459 Display archived email notifications

    • -10
    • +18
    ./emailnotifications/archivedEmailList.jsp
  1. … 3 more files in changeset.
LDEV-4459 Archive immediate or scheduled email notifications

    • -3
    • +7
    ./emailnotifications/courseNotifications.jsp
    • -5
    • +7
    ./emailnotifications/lessonNotifications.jsp
  1. … 8 more files in changeset.
LDEV-4459 Archived notifications front end

    • -12
    • +0
    ./emailnotifications/additionalSettings.jsp
    • -0
    • +90
    ./emailnotifications/archivedEmailList.jsp
    • -1
    • +15
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +15
    ./emailnotifications/lessonNotifications.jsp
  1. … 3 more files in changeset.