lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4438'

LDEV-4438 Add unique constraint (assessment_uid, user_uid, latest)

Add unique constraint (assessment_uid, user_uid, latest) to

tl_laasse10_assessment_result which will apply only in case latest=1. It

was done by making 'latest' field contain only NULL or 1 (as opposite to

the previously used 0 or 1). This way constraint will apply only in

cases when 'latest' is 1.

Merge branch 'LDEV-4415' Marks can now be weighted

LDEV-4435 Portraits displayed for View Learners grouping option

    • -4
    • +10
    /lams_learning/web/grouping/choose.jsp
LDEV-4054: Adding Greek

Adding Greek to peer review tool

    • -0
    • +177
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
LDEV-4054: Updating translations

Updating Greek and Norwegian

LDEV-4054: Updating translations

Updating English, Greek and Norwegian

LDEV-4054: Updating translations

Updating English and Greek

LDEV-4054: Updating translations

Updating Greek

LDEV-4054: Updating translations

Updating English

LDEV-4054: Updating translations

Translating English and Greek

LDEV-4054: Updating translations

Updating Greek and English

LDEV-4054: Updating translations

Updating Greek and English

LDEV-4054: Updating translations

Updating Greek and English

LDEV-4054: Updating translations

Updating English (AU)

LDEV-4054: Updating translations

Updating Greek

LDEV-4054: Updating translations

Updating English and Greek

LDEV-4054: Updating translations

Upgrading English, Greek, Spanish, Norwegian

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

LDEV-4293 Tune session log out

Make sure mapping login->session is cleared in certain situations.

Check if a session already exists for the given login. If so, invalidate

one of the sessions.

Update LAMS libraries after merge

    • binary
    /lams_build/lib/lams/lams-central.jar
Merge branch 'LDEV-4293' into lams31

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.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/web/action/MonitoringAction.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/MonitoringAction.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. … 15 more files in changeset.
LDEV-4293 Rewrite session invalidation mechanism

Server-side non-current session invalidation does not work well on

clustered WildFly 10. It breaks Infinispan distributed session cache and

makes a logged out user clear LAMS cookies, otherwise he/she gets a

blank screen. See WFLY-7281 and WFLY-7229.

So instead of invalidating a session we mark it for invalidation. The

next time the user tries to use it, the session gets invalidated and the

user gets an error screen (not a very clean solution, but more effective

than another filter which would nicely redirect the user to logout

screen).

This solution seems to work nicely if both browsers interact with the

same node. Since we use distributed session for failover rather than

replication, it should be OK.

LDEV-2875: fixing encoding parameter

It seemt that now Java is a lot more picky and UTF-8 has to be utf-8.

LDEV-3517: adding labels to i18n

Adding all the labels to i18n site

Merge branch 'LDEV-4432'

LDEV-4432 Solve the problem with dialog's checkbox gets focused on start

Solved by adding an empty <div> to the beginning of the dialog and

marking this div as required to be focused.

LDEV-4433: reverting files that shouldn't have changed.

LDEV-4433: adding new label