Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Gradebook toogleMarks

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

    • -0
    • +155
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 116 more files in changeset.
LDEV-4440 Scratchie autosave fix

  1. … 61 more files in changeset.
LDEV-4440 Scratchie authoring reflections fix

  1. … 14 more files in changeset.
LDEV-4440 Corrected manage leaders functionality

LDEV-4440 Leader tool corrected leaderselection.jsp

LDEV-4440 Leader tool with nostruts library

    • -1
    • +0
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -29
    • +28
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 6 more files in changeset.
LDEV-4440 Notebook revised

  1. … 4 more files in changeset.
LDEV-4440 Notebook with post method

  1. … 7 more files in changeset.
LDEV-4440 Survey ready

  1. … 9 more files in changeset.
LDEV-4440 leaderselection nostruts

    • -212
    • +0
    ./WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    ./WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    ./WEB-INF/tlds/struts/struts-nested.tld
    • -343
    • +0
    ./WEB-INF/tlds/struts/struts-tiles-el.tld
    • -344
    • +0
    ./WEB-INF/tlds/struts/struts-tiles.tld
  1. … 5 more files in changeset.
LDEV-4440 start working on leaderselection tool

    • -19
    • +57
    ./pages/monitoring/monitoring.jsp
  1. … 15 more files in changeset.
LDEV-4440 notebook nostruts library

  1. … 19 more files in changeset.
LDEV-4440 switch survey to nostruts library

    • -0
    • +17
    ./WEB-INF/spring-servlet.xml
    • -95
    • +128
    ./pages/learning/leaderselection.jsp
  1. … 32 more files in changeset.
LDEV-4440 Finished survey

  1. … 23 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.
LDEV-4533 Exception details are hidden as per system config

  1. … 34 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-4423 Additional portrait entries

  1. … 9 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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 41 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.