Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 LAMS Central learning link fixed

  1. … 27 more files in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -0
    • +155
    ./tags/OutcomeAuthor.tag
  1. … 117 more files in changeset.
LDEV-4440 Remove struts leftovers

  1. … 3 more files in changeset.
LDEV-4440 Migration of Multiple Choice in progress

    • -212
    • +0
    ./tlds/struts/struts-bean-el.tld
    • -3302
    • +0
    ./tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./tlds/struts/struts-html.tld
    • -382
    • +0
    ./tlds/struts/struts-logic-el.tld
    • -3171
    • +0
    ./tlds/struts/struts-nested.tld
    • -343
    • +0
    ./tlds/struts/struts-tiles-el.tld
  1. … 11 more files in changeset.
Merge Asia's Image Gallery

    • -1
    • +0
    ./tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./tags/AuthoringRatingCriteria.tag
  1. … 66 more files in changeset.
LDEV-4440 Started migration of Multiple Choices

    • -0
    • +17
    ./spring-servlet.xml
    • -1
    • +0
    ./tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./tags/AuthoringRatingCriteria.tag
  1. … 40 more files in changeset.
LDEV-4559 Comments can be left anonymously.

  1. … 91 more files in changeset.
LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

  1. … 35 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.
LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

  1. … 50 more files in changeset.
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-4473 Add bootstrap.js when it's not available on page

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

  1. … 33 more files in changeset.
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

  1. … 44 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 73 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 74 more files in changeset.
LDEV-4407 Move Java classes to the appropriate packages

Util classes were moved to .util package. Struts actions - to

.web.action package

  1. … 21 more files in changeset.
LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

  1. … 23 more files in changeset.
LDEV-4395 Sizing tweaks

  1. … 33 more files in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

    • -0
    • +28
    ./tags/LeaderDisplay.tag
  1. … 87 more files in changeset.
LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

  1. … 52 more files in changeset.
LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

  1. … 37 more files in changeset.
LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

  1. … 37 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 155 more files in changeset.
LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

  1. … 15 more files in changeset.
LDEV-2866 Authoring code refactoring

  1. … 55 more files in changeset.
LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

  1. … 39 more files in changeset.
LDEV-2866 Code refactoring

  1. … 47 more files in changeset.
LDEV-4332: Refresh page or reconnect websocket only on abnormal close and not on navigation.

  1. … 35 more files in changeset.