lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4293 Prevent deadlock exceptions on logout

It seems that a server-side logout not only causes invalidation

exception (which will be dealt with soon), but also puts session fetch

transaction in deadlock. This commit fixed the deadlock.

Merge remote-tracking branch 'origin/master' into lams31

LDEV-4408 Allow session deletion

    • -4
    • +5
    /lams_admin/web/WEB-INF/struts-config.xml
    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +22
    /lams_admin/web/sessionmaintain.jsp
LDEV-4293 Change place where session gets mapped to login

UniversalLoginModule can be accessed without going through SsoHandler

when a session gets replicated. It means that it misses login ->

sessionID mapping which is needed for double login detection. The code

was rewritten to make sure login is properly mapped. It may be optimised

later so the mapping does not happen on every session start.

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 28 more files in changeset.
Merge LDEV-4408 into lams31

Merge branch 'LDEV-4408'

LDEV-4408 Implement session list in sysadmin

    • -0
    • +12
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +5
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -0
    • +16
    /lams_admin/web/sessionlist.jsp
Merge branch 'LDEV-4293' into lams31

LDEV-4400 Update session ID after is gets changed

In LAMS we keep a mapping between session ID and session object. Session

ID gets changed after log in to prevent session fixation attack. We need

to update the mapping too.

LDEV-4402 Reintroduce XML Commons library

The library was supposed to become obsolete after changing XStream cod,

but is still required by Struts and Apache Commons Validator.

Also obsolete entries for JBoss Web and Gson were removed from a

configuration file.

    • binary
    /lams_build/lib/xml-commons/xml-apis.jar
LDEV-4293 Skip isSysAdmin check when there is no session

The code that checks if user is sysadmin depends on HTTP session being

present in SessionManager. It is normally present as the authentication

request goes through SsoHandler which initiates the session. It is not

the case, though, when session gets replicated and UniversalLoginModule

is accessed directly.

The fix skips the check in no session is present, which means that

sysadmin will need to authenticate same as regular user, which is OK for

this edge situation. Session failover still works.

LDEV-4293, LDEV-4400 Update domain configuration for WF10

WildFly 10 configuration files are slightly changed compared to WildFly

8 and LAMS custom stuff had to be adjusted too.

    • -119
    • +244
    /lams_build/conf/domain.xml
Merge remote-tracking branch 'origin/master' into lams31

LDEV-4415 Add front end for weighted outputs

    • -3
    • +32
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +28
    /lams_central/web/css/_authoring_base.scss
LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

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

Implmented in Images, IMSCC, Kalture, MC and QA

  1. … 11 more files in changeset.
Merge branch 'LDEV-4418'

LDEV-4418 Bump building block's version number

    • -0
    • +3
    /lams_bb_integration/RELEASE_NOTES.TXT
Merge branch 'LDEV-4418'

LDEV-4418 Change back button javascript

Change the onClick for the "Cancel" button to be the resource link

rather than the back() javascript.

LDEV-4417 Popover portraits in Monitoring

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

    • -1
    • +7
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    /lams_central/web/css/_learner_base.scss
    • -1
    • +7
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
  1. … 59 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

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

    • -1
    • +7
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    /lams_central/web/css/_learner_base.scss
    • -1
    • +7
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
  1. … 60 more files in changeset.
LDEV-4416 Validation for max rating and posts allows 0

The validation on the back end for the max ratings and max posts

in a thread was not allowing for the special 0 case. Also cleaned

up some javascript errors in monitoring.

LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

  1. … 19 more files in changeset.
LDEV-3115 The start and end co-ordinates were missing during the import.

Options With Sequences behave similar to Branching in Flashless

Authoring.

Merge branch 'LDEV-4374'

LDEV-4374 Hide search widget if there is less than 10 courses

If the number of active courses that user has access to is less

than 10 - we don't display search widget.