lams_tool_larsrc

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Shared resources nostrut final

    • -5
    • +4
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -212
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic-el.tld
  1. … 6 more files in changeset.
LDEV-4440 Share resources nostrut + Q&A

    • -1
    • +1
    ./web/pages/itemreview/instructionsnav.jsp
    • -1
    • +1
    ./web/pages/monitoring/editactivity.jsp
LDEV-4440 Shared resources udate

  1. … 1 more file in changeset.
LDEV-4440 Share resource - work in progress, almost finished authoring

    • -1
    • +1
    ./web/pages/authoring/parts/addfile.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addheader.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addurl.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addwebsite.jsp
  1. … 4 more files in changeset.
LDEV-4440 Sared resources - authoring - work in progress

    • -3
    • +3
    ./web/pages/authoring/parts/addfile.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addheader.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addurl.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addwebsite.jsp
  1. … 22 more files in changeset.
LDEV-4440 Share Resources & Q&A tools.

    • -0
    • +6
    ./.externalToolBuilders/SASS_lams_tool_larsrc.launch
  1. … 58 more files in changeset.
LDEV-4440 FileValidatorSpringUtil

LDEV-4603 Delete preview lessons with ratings now works

  1. … 3 more files in changeset.
LDEV-4591 Show only the finished button when no instructions exist

LDEV-4591 Show only the finished button when no instructions exist

    • -8
    • +3
    ./web/pages/itemreview/instructionsnav.jsp
LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

  1. … 48 more files in changeset.
LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

  1. … 38 more files in changeset.
LDEV-4559 Comments can be left anonymously.

    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  1. … 91 more files in changeset.
LDEV-4558 Rename dbupdate files as name is a month out.

  1. … 38 more files in changeset.
LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

  1. … 28 more files in changeset.
Monthly merge from master to lams31

Conflicts:

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/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 19 more files in changeset.
LDEV-4543 Can access resources from monitor with no sessions

    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_tool_larsrc.launch
    • -0
    • +27
    ./web/css/monitor.scss
    • -22
    • +26
    ./web/pages/monitoring/summary.jsp
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.
LDEV-4054 Updating labels

Updating Greek

  1. … 5 more files in changeset.
LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

  1. … 8 more files in changeset.
LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

  1. … 52 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. … 82 more files in changeset.
LDEV-4533 Exception details are hidden as per system config

  1. … 34 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 34 more files in changeset.
LDEV-4501 All Audit Log entries are now Log Event entries

  1. … 60 more files in changeset.
LDEV-4503 All http resources on a https server open in a popup

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-4509 Allow zipped websites in Share Resources

Apparently on Windows zip file type is described differently than on

Unix.

    • -3
    • +3
    ./web/pages/authoring/parts/addwebsite.jsp
LDEV-4501 Tool context files no longer reference audit service.

  1. … 62 more files in changeset.
LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

  1. … 57 more files in changeset.