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
Wednesday 11 Oct 2017
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
Sunday 08 Oct 2017
3:12 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-2875: fixing encoding parameter

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

Options
    • -1
    • +1
    /moodle/mod/lamslesson/lib.php
3:11 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3517: adding labels to i18n

Adding all the labels to i18n site

Options
    • -85
    • +99
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -84
    • +91
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
Saturday 07 Oct 2017
8:28 am

Andrey Balan

Merge branch 'LDEV-4432'

Options
8:27 am

Andrey Balan

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.

Options
    • -9
    • +2
    /lams_central/web/ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • -0
    • +7
    /lams_central/web/ckeditor/plugins/bootsnippets/plugin.js
8:14 am

Ernie Ghiglione <ernieg@gmail.com>

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

Options
    • -4
    • +0
    /lams_build/common.properties
    • -1
    • +0
    /lams_build/unix.properties
8:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: adding new label

Options
    • -1
    • +5
    /lams_build/common.properties
    • -1
    • +2
    /lams_build/unix.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
Friday 06 Oct 2017
8:03 pm

Andrey Balan

Merge branch 'LDEV-4433'

Options
8:02 pm

Andrey Balan

LDEV-4433 Move simplified activities info to Lesson summary tab

Besides, display info only for those activities that have numeric

outputs (which are Assessment, MCQ or Sratchie. Also activity must be

set to produce tool outputs in Authoring)

Options
    • -55
    • +67
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4431 Portraits shown in Monitor and Course Gradebook

Options
    • -6
    • +19
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -5
    • +18
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -7
    • +33
    /lams_gradebook/web/gradebookMonitor.jsp
    • -2
    • +5
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
2:55 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4432: Tweaking snippets video

Fixing layout and embedding video options

Options
    • -1
    • +1
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
    • binary
    /lams_www/web/public/ckeditor-templates/images/video.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/video_side_text.png
12:42 am

Andrey Balan

LDEV-4433 Add 'Simplified activity' tab to the lesson gradebook export

Options
    • -0
    • +52
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java