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
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
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -0
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +3
    /lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
    • -6
    • +14
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
    • -0
    • +12
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
    • -11
    • +6
    /lams_tool_scribe/web/layouts/defaultLayout.jsp
    • -6
    • +10
    /lams_tool_scribe/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
    • -1
    • +2
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java
    • -2
    • +10
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
    • -0
    • +5
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
  16. … 21 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
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170814.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql
Tuesday 12 Sep 2017
4:37 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4424: display larger portrait pic

Display a larger portrait picture when showing the profile options

Options
    • -2
    • +2
    /lams_central/web/profile.jsp
3:22 pm

Andrey Balan

Merge branch 'LDEV-4419'

Options
3:21 pm

Andrey Balan

LDEV-4419 Add widget for cropping portrait photos

Added widget that allows cropping the image to a standardised size for

webcam and image uploads (in order to make it squarish).

Options
    • -0
    • +250
    /lams_central/web/css/croppie.css
    • -0
    • +7
    /lams_central/web/includes/javascript/croppie.js
6:59 am

Andrey Balan

Merge branch 'LDEV-4419'

Options
6:53 am

Andrey Balan

LDEV-4419 Add widget for cropping portrait photos

Added widget that allows cropping the image to a standardised size for

webcam and image uploads (in order to make it squarish).

Options
    • -6
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -7
    • +30
    /lams_central/web/includes/javascript/webrtc-capturestill.js
    • -27
    • +74
    /lams_central/web/portrait.jsp
Monday 11 Sep 2017
12:39 pm

Marcin Cieslak

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.

Options
    • -1
    • +1
    /lams_build/conf/domain.xml
12:00 pm

Marcin Cieslak

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

Options
11:59 am

Marcin Cieslak

LDEV-4408 Allow session deletion

Options
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -45
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionListAction.java
    • -0
    • +54
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionMaintainAction.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -4
    • +5
    /lams_admin/web/WEB-INF/struts-config.xml
    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -16
    • +0
    /lams_admin/web/sessionlist.jsp
    • -0
    • +22
    /lams_admin/web/sessionmaintain.jsp
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
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -7
    • +3
    /lams_common/src/java/org/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
    • -2
    • +3
    /lams_central/web/includes/javascript/portrait.js
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/StyledRatingDTO.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +3
    /lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
    • -18
    • +32
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -0
    • +10
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
    • -0
    • +11
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -1
    • +2
    /lams_tool_larsrc/web/pages/monitoring/reflections.jsp
    • -8
    • +18
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
    • -0
    • +12
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dto/LeaderselectionUserDTO.java
    • -1
    • +1
    /lams_tool_leader/web/pages/monitoring/headItems.jsp
    • -2
    • +8
    /lams_tool_leader/web/pages/monitoring/summary.jsp
  16. … 28 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
    • -2
    • +3
    /lams_central/web/includes/javascript/portrait.js
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/StyledRatingDTO.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +3
    /lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
    • -18
    • +32
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -0
    • +10
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
    • -0
    • +11
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -1
    • +2
    /lams_tool_larsrc/web/pages/monitoring/reflections.jsp
    • -8
    • +18
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
    • -0
    • +12
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dto/LeaderselectionUserDTO.java
    • -1
    • +1
    /lams_tool_leader/web/pages/monitoring/headItems.jsp
    • -2
    • +8
    /lams_tool_leader/web/pages/monitoring/summary.jsp
  16. … 28 more files in changeset.
Sunday 10 Sep 2017
12:29 pm

Marcin Cieslak

Merge LDEV-4408 into lams31

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
12:23 pm

Marcin Cieslak

Merge branch 'LDEV-4408'

Options
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • -0
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +45
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SessionListAction.java
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -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
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
Saturday 09 Sep 2017
4:46 pm

Marcin Cieslak

Merge branch 'LDEV-4293' into lams31

Options
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
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -22
    • +41
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
4:45 pm

Marcin Cieslak

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.

Options
    • -0
    • +10
    /lams_build/build.xml
    • -2
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • binary
    /lams_build/lib/xml-commons/xml-apis-ext.jar
    • binary
    /lams_build/lib/xml-commons/xml-apis.jar
    • -0
    • +49
    /lams_build/lib/xml-commons/xmlcommons.module.xml
4:42 pm

Marcin Cieslak

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.

Options
    • -6
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
4:39 pm

Marcin Cieslak

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.

Options
    • -119
    • +244
    /lams_build/conf/domain.xml
    • -21
    • +35
    /lams_build/conf/host.xml
    • binary
    /lams_build/lib/lams/lams.jar
Friday 08 Sep 2017
9:12 pm

Marcin Cieslak

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

Options
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +6
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -3
    • +32
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +28
    /lams_central/web/css/_authoring_base.scss
    • -7
    • +29
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -7
    • +122
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +5
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +9
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170829.sql
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Monday 04 Sep 2017
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -0
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ReflectDTO.java
    • -0
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
    • -9
    • +26
    /lams_tool_images/web/pages/monitoring/summary.jsp
    • -0
    • +10
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java
    • -1
    • +8
    /lams_tool_imscc/web/pages/monitoring/summary.jsp
    • -2
    • +9
    /lams_tool_imscc/web/pages/monitoring/userlist.jsp
    • -0
    • +10
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java
    • -0
    • +1
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
    • -1
    • +8
    /lams_tool_kaltura/web/pages/monitoring/reflections.jsp
    • -1
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
  16. … 11 more files in changeset.
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -0
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/ReflectDTO.java
    • -0
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
    • -9
    • +26
    /lams_tool_images/web/pages/monitoring/summary.jsp
    • -0
    • +10
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java
    • -1
    • +8
    /lams_tool_imscc/web/pages/monitoring/summary.jsp
    • -2
    • +9
    /lams_tool_imscc/web/pages/monitoring/userlist.jsp
    • -0
    • +10
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java
    • -0
    • +1
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
    • -1
    • +8
    /lams_tool_kaltura/web/pages/monitoring/reflections.jsp
    • -1
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -11
    • +27
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -1
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java
    • -0
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/ReflectionDTO.java
  16. … 11 more files in changeset.
Wednesday 30 Aug 2017
10:35 pm

Andrey Balan

Merge branch 'LDEV-4418'

Options
10:35 pm

Andrey Balan

LDEV-4418 Bump building block's version number

Options
    • -0
    • +3
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
10:32 pm

Andrey Balan

Merge branch 'LDEV-4418'

Options
10:31 pm

Andrey Balan

LDEV-4418 Change back button javascript

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

rather than the back() javascript.

Options
    • -14
    • +8
    /lams_bb_integration/web/modules/create.jsp
    • -13
    • +9
    /lams_bb_integration/web/modules/learnermonitor.jsp
    • -10
    • +4
    /lams_bb_integration/web/modules/modify.jsp
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -1
    • +7
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -30
    • +67
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +7
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    /lams_central/web/css/_learner_base.scss
    • -7
    • +50
    /lams_central/web/includes/javascript/portrait.js
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +7
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +7
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
  16. … 59 more files in changeset.