lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 13 Oct 2017
8:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -26
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -34
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -10
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -10
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -10
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
1:48 pm

Marcin Cieslak

Merge branch 'LDEV-4439'

Options
1:47 pm

Marcin Cieslak

LDEV-4439 Fix a typo in optional activity properties init code

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
Thursday 12 Oct 2017
10:57 pm

Andrey Balan

LDEV-4438 Remove unique constraint added in the previous patch

The new constraint handles all problematic cases including the one with

copying results from leaders. Thus we no longer need

UQ_tl_laasse10_assessment_result_4 (assessment_uid, user_uid,

finish_date) constraint.

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
11:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Spanish for various projects

Options
    • -9
    • +9
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +8
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
7:39 am

Andrey Balan

LDEV-4438 fix autopatch script typo

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
3:29 am

Andrey Balan

Merge branch 'LDEV-4438'

Options
3:27 am

Andrey Balan

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.

Options
    • -0
    • +31
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 11 Oct 2017
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
1:27 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4435 Portraits displayed for View Learners grouping option

Options
    • -4
    • +10
    /lams_learning/web/grouping/choose.jsp
12:48 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Adding Greek

Adding Greek to peer review tool

Options
    • -0
    • +177
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
12:46 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and Norwegian

Options
    • -2
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
12:45 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English, Greek and Norwegian

Options
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_tool_leader/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +4
    /lams_tool_leader/conf/language/lams/ApplicationResources_no_NO.properties
12:44 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Greek

Options
    • -3
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
12:43 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
12:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English

Options
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
12:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Translating English and Greek

Options
    • -3
    • +4
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_gmap/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties
12:40 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -8
    • +9
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
12:39 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -5
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
12:38 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -4
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +7
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
12:26 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English (AU)

Options
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
12:25 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -2
    • +3
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
12:23 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Greek

Options
    • -2
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
12:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Upgrading English, Greek, Spanish, Norwegian

Options
    • -253
    • +254
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    /lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +7
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    /lams_tool_forum/conf/language/lams/ApplicationResources_no_NO.properties
10:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -4
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -3
    • +71
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Monday 09 Oct 2017
9:14 pm

Marcin Cieslak

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.

Options
    • -1
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -5
    • +6
    /lams_central/web/login.jsp
    • -5
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
5:12 pm

Marcin Cieslak

Update LAMS libraries after merge

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
5:09 pm

Marcin Cieslak

Merge branch 'LDEV-4293' into lams31

Options
5:08 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_build/common.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_build/unix.properties
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -1
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -11
    • +49
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
    • -0
    • +3
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -39
    • +9
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -0
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
  16. … 15 more files in changeset.
4:23 pm

Marcin Cieslak

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.

Options
    • -17
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -4
    • +3
    /lams_central/web/login.jsp
    • -30
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -12
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java