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
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 116 more files in changeset.
LDEV-4440 Rewrite Vote to conform with new guidelines

  1. … 5 more files in changeset.
Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

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

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

  1. … 26 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.
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. … 32 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-4440 Fix Vote statistics URL

Struts considered absolute URLs relative to module context, for example

/monitoring/stats.do translates into

http://localhost/lams/tool/lavote11/monitoring/stats.do

Spring considers absolute URLs relative to server context, for example

/monitoring/stats.do translates into

http://localhost/lams/monitoring/stats.do

Because of this URLs (ajax, form actions etc.) need to be rewritten when

migrating to Spring.

    • -1
    • +1
    ./monitoring/MonitoringMaincontent.jsp
LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

    • -1
    • +0
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +32
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
    • -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
  1. … 53 more files in changeset.
LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

  1. … 12 more files in changeset.
LDEV-4440 Rewrite configuration of an example tool

Struts servlet gets replaced with Spring one. It has its own

configuration in a separate XML file.

    • -0
    • +17
    ./WEB-INF/spring-servlet.xml
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 Scratchie, Spreadsheet, Scribe, Task, Vote

    • -1
    • +2
    ./monitoring/OtherTextNominationViewer.jsp
  1. … 32 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

    • -1
    • +2
    ./monitoring/OtherTextNominationViewer.jsp
  1. … 32 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 classes to the proper packages

Action classes were moved to tool.vote.web.action package; exception to

tool.vote.web.util.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

  1. … 16 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
    ./WEB-INF/tags/LeaderDisplay.tag
    • -5
    • +2
    ./learning/IndividualLearnerResults.jsp
    • -5
    • +2
    ./learning/RevisitedAllNominations.jsp
  1. … 81 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. … 53 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.