lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4542 Add missing CSS rule for the folder tree itself

    • -1
    • +1
    /lams_central/web/css/_authoring_base.scss
LDEV-4540 Show other teams' answers on results page

LDEV-4540 Show answers of current team

LDEV-4054 Updating labels

Updating Greek

LDEV-4540 Let author choose whether to disclose answers in monitor

Merge branch 'LDEV-4544'

LDEV-4544 Prevent saving to Courses folder

LDEV-4544 Highlight folder where existing LD resides

Merge branch 'LDEV-4542'

LDEV-4542 Make dir tree in authoring wider

    • -2
    • +2
    /lams_central/web/css/_authoring_base.scss
LDEV-3000 Import special UTF8 characters

When exporting, text which has special UTF8 characters gets split into

multiple parts: CDATA, the character, CDATA. LAMS importer is now ready

to parse it.

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

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

    • -1
    • +1
    /lams_monitoring/web/css/tblmonitor.scss
    • -2
    • +10
    /lams_monitoring/web/gate/gateStatus.jsp
    • -4
    • +12
    /lams_monitoring/web/tblmonitor/gates.jsp
LDEV-4538 Persist new gate parameters: open user and time

LDEV-4538 Gate can not be already open in authoring

LDEV-4485 LDEV-4519 LDEV-4501 LDEV-4366

Adding missing labels for these JIRAs

LDEV-4536 Add portrait pics to teams tabs in TBL monitoring

    • -14
    • +17
    /lams_monitoring/web/tblmonitor/teams.jsp
LDEV-4539 Monitor can preview results emails before being sent.

LDEV-4537modifying fonticon

modifying fonticon for manage users as it conflicts with existing css for TBL UI. Hopefully this icon is even more representative of the label

Merge branch 'LDEV-4537'

    • binary
    /lams_build/lib/lams/lams-central.jar
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.