lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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
Monday 30 Oct 2017
3:50 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

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

Options
    • -0
    • +35
    ./lamsfoundation/lams/commonContext.xml
  2. … 4 more files in changeset.
Sunday 29 Oct 2017
1:18 am

Marcin Cieslak

LDEV-4411 Enable and configure Hibernate 2nd level cache

This configuration is only for standalone mode. It is explained in JIRA

comments.

Options
    • -11
    • +2
    ./lamsfoundation/lams/applicationContext.xml
  2. … 1 more file in changeset.
Thursday 26 Oct 2017
6:55 am

Andrey Balan

LDEV-4451 Create Confidence level system

Create Confidence level classes similar to the Ratings ones, that we

already have. They must be located in lams_common folder as it's going

to be used by 3 tools: learners are going to enter them in Assessment

and MCQ, and we later display them in all three tools.

Options
    • -0
    • +35
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +85
    ./lamsfoundation/lams/confidencelevel/ConfidenceLevel.java
    • -0
    • +51
    ./lamsfoundation/lams/confidencelevel/dao/IConfidenceLevelDAO.java
    • -0
    • +109
    ./lamsfoundation/lams/confidencelevel/dao/hibernate/ConfidenceLevelDAO.java
    • -0
    • +30
    ./lamsfoundation/lams/confidencelevel/dto/ConfidenceLevelDTO.java
    • -0
    • +29
    ./lamsfoundation/lams/confidencelevel/dto/QuestionConfidenceLevelDTO.java
    • -0
    • +145
    ./lamsfoundation/lams/confidencelevel/service/ConfidenceLevelService.java
    • -0
    • +73
    ./lamsfoundation/lams/confidencelevel/service/IConfidenceLevelService.java
    • -0
    • +24
    ./lamsfoundation/lams/dbupdates/patch20171016.sql
  10. … 2 more files in changeset.
Tuesday 24 Oct 2017
12:05 am

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • -1
    • +3
    ./lamsfoundation/lams/dbupdates/patch20171023.sql
    • -1
    • +11
    ./lamsfoundation/lams/usermanagement/Organisation.java
  3. … 6 more files in changeset.
Monday 23 Oct 2017
11:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20171023.sql
    • -0
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 5 more files in changeset.
Saturday 14 Oct 2017
8:51 pm

Marcin Cieslak

LDEV-4400, LDEV-3315 Toggle session ID change for each LAMS module

WildFly 10 changes session ID after authentication by default in order

to prevent session fixation attack. It breaks TestHarness, though. In

order to run TH, session ID change needs to be turned off.

Turning it off for Central is not enough as a request to any other

module, like Tool, triggers session ID change. In this case we need to

have session ID change turned on or off in each LAMS module, not just

Central.

Options
    • -0
    • +45
    ./lamsfoundation/lams/integration/security/CommonDeploymentHandler.java
    • -2
    • +2
    ./lamsfoundation/lams/integration/security/SsoHandler.java
  3. … 3 more files in changeset.
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
    • -10
    • +14
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -10
    • +20
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 7 more files in changeset.
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
    • -5
    • +21
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 2 more files in changeset.
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
    • -6
    • +8
    ./lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +1
    ./lamsfoundation/lams/util/WebUtil.java
  3. … 28 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
    • -30
    • +17
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -12
    • +14
    ./lamsfoundation/lams/web/session/SessionManager.java
  3. … 2 more files in changeset.
Sunday 01 Oct 2017
2:05 am

Marcin Cieslak

LDEV-4366 Initial implementation of Kumalive reports

Latest free jqGrid is used as the one present in lams_central is

outdated and standard jqGrid became commercial.

Use bootstrap theme with Font Awesome icons.

Rewrite XML code used in Gradebook to feed jqGrid into JSON.

Options
    • -0
    • +1
    ./lamsfoundation/lams/dbupdates/patch20170710.sql
  2. … 14 more files in changeset.
1:09 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

Options
    • -2
    • +5
    ./lamsfoundation/lams/usermanagement/User.java
  2. … 3 more files in changeset.
Thursday 28 Sep 2017
12:15 am

Andrey Balan

LDEV-4428 Start supporting cy and id languages in CKEditor

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20170926.sql
Wednesday 27 Sep 2017
2:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • -1
    • +3
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -11
    • +22
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
  3. … 15 more files in changeset.
Friday 22 Sep 2017
11:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

Options
    • -0
    • +1
    ./lamsfoundation/lams/util/WebUtil.java
  2. … 12 more files in changeset.
Thursday 14 Sep 2017
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -1
    • +2
    ./lamsfoundation/lams/usermanagement/User.java
    • -2
    • +3
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -1
    • +12
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
  4. … 33 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -1
    • +2
    ./lamsfoundation/lams/usermanagement/User.java
    • -2
    • +3
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -1
    • +12
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
  4. … 33 more files in changeset.
Wednesday 13 Sep 2017
8:29 pm

Andrey Balan

LDEV-4426 Fix autopatch file name

Some time ago we switched to using dates as autopatch file names

instead of previously used version numbers. So make this aupatch

file name comply with this rule.

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20170814.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch2040085.sql
Monday 11 Sep 2017
11:51 am

Marcin Cieslak

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.

Options
    • -4
    • +1
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -7
    • +3
    ./lamsfoundation/lams/web/session/SessionManager.java
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -1
    • +10
    ./lamsfoundation/lams/rating/dto/StyledRatingDTO.java
    • -5
    • +7
    ./lamsfoundation/lams/rating/service/RatingService.java
  3. … 41 more files in changeset.
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -1
    • +10
    ./lamsfoundation/lams/rating/dto/StyledRatingDTO.java
    • -5
    • +7
    ./lamsfoundation/lams/rating/service/RatingService.java
  3. … 41 more files in changeset.
Sunday 10 Sep 2017
12:29 pm

Marcin Cieslak

Merge LDEV-4408 into lams31

Options
    • -0
    • +13
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 1 more file in changeset.
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • -1
    • +14
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 7 more files in changeset.
Saturday 09 Sep 2017
4:46 pm

Marcin Cieslak

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.

Options
    • -7
    • +8
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -22
    • +41
    ./lamsfoundation/lams/web/session/SessionManager.java
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • -22
    • +0
    ./lamsfoundation/lams/dbupdates/patch20170829.sql
    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20170908.sql
    • -3
    • +3
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  6. … 10 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -0
    • +6
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +26
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 72 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -0
    • +6
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +26
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 73 more files in changeset.
2:30 am

Marcin Cieslak

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.

Options
    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20170829.sql
    • -30
    • +17
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -19
    • +18
    ./lamsfoundation/lams/learningdesign/ToolActivity.java
    • -10
    • +14
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -10
    • +20
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +8
    ./lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
    • -9
    • +5
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -41
    • +19
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -0
    • +1
    ./lamsfoundation/lams/util/AuthoringJsonTags.java
    • -22
    • +9
    ./lamsfoundation/lams/util/VersionUtil.java
  11. … 9 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -9
    • +18
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -5
    • +16
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 32 more files in changeset.
Thursday 24 Aug 2017
10:41 pm

Marcin Cieslak

LDEV-3115 The start and end co-ordinates were missing during the import.

Options With Sequences behave similar to Branching in Flashless

Authoring.

Options
    • -3
    • +14
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java