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
Tuesday 26 Sep 2017
11:50 pm

Marcin Cieslak

LDEV-4415 Allow removing weights from saved LD

Options
    • -1
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:52 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating Greek

Updating Greek with latest changes

Options
    • -2
    • +5
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
Monday 25 Sep 2017
9:14 pm

Marcin Cieslak

LDEV-4415 Add a title to weights dialog

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
8:45 pm

Marcin Cieslak

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

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
8:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -2
    • +2
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -0
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
    • -36
    • +102
    /lams_admin/web/user.jsp
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +66
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
Sunday 24 Sep 2017
9:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4420 Lesson status changes recorded in audit log.

Options
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +40
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
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
    /lams_central/web/css/_learner_base.scss
    • -2
    • +2
    /lams_central/web/css/orgGroup.scss
    • -0
    • +1
    /lams_central/web/emailuser.jsp
    • -4
    • +11
    /lams_central/web/includes/javascript/orgGroup.js
    • -0
    • +1
    /lams_central/web/orgGroup.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -20
    • +45
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -4
    • +13
    /lams_learning/web/notebook/view.jsp
    • -9
    • +5
    /lams_learning/web/notebook/viewalljournals.jsp
    • -14
    • +1
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -1
    • +2
    /lams_monitoring/web/grouping/viewGroups.jsp
    • -7
    • +17
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -0
    • +1
    /lams_monitoring/web/monitor.jsp
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    /lams_admin/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +7
    /lams_central/web/WEB-INF/tags/StyledRating.tag
    • -0
    • +5
    /lams_central/web/css/_learner_base.scss
    • -0
    • +39
    /lams_central/web/includes/javascript/portrait.js
    • -5
    • +7
    /lams_gradebook/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +7
    /lams_learning/web/WEB-INF/tags/StyledRating.tag
    • -1
    • +1
    /lams_learning/web/grouping/show.jsp
    • -5
    • +7
    /lams_monitoring/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +7
    /lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +7
    /lams_tool_bbb/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +7
    /lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +8
    /lams_tool_chat/web/includes/css/chat.scss
    • -11
    • +30
    /lams_tool_chat/web/includes/css/chat_rtl.scss
    • -4
    • +4
    /lams_tool_chat/web/pages/learning/learning.jsp
    • -5
    • +7
    /lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
  16. … 30 more files in changeset.
Friday 15 Sep 2017
10:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4412: Audit log entries are created when lessons are removed.

Options
    • -1
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +8
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and Norwegian

Updating Greek and Norwegian

Options
    • -2
    • +10
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    /lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties
8:55 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and Norwegian

Updating Greek and Norwegian

Options
    • -2
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
Thursday 14 Sep 2017
7:37 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Options
6:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

Options
    • binary
    /lams_build/lib/lams/lams.jar
5:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_tool_gmap/web/pages/monitoring/headItems.jsp
    • -3
    • +2
    /lams_tool_gmap/web/pages/monitoring/summary.jsp
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/portrait.js
    • -0
    • +10
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
    • -1
    • +8
    /lams_tool_doku/web/pages/monitoring/reflections.jsp
    • -0
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_wiki/web/pages/monitoring/headItems.jsp
    • -1
    • +7
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/portrait.js
    • -0
    • +10
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java
    • -1
    • +8
    /lams_tool_doku/web/pages/monitoring/reflections.jsp
    • -0
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_wiki/web/pages/monitoring/headItems.jsp
    • -1
    • +7
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
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.
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.