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
Monday 11 Sep 2017
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.
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
    • binary
    /lams_build/lib/lams/lams.jar
    • -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
  16. … 60 more files in changeset.
10:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4416 Validation for max rating and posts allows 0

The validation on the back end for the max ratings and max posts

in a thread was not allowing for the special 0 case. Also cleaned

up some javascript errors in monitoring.

Options
    • -12
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
    • -1
    • +1
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
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
    • binary
    /lams_build/lib/lams/lams.jar
    • -28
    • +19
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -42
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -33
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -3
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -8
    • +5
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -32
    • +19
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170829.sql
    • -30
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -19
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.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
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
    • -9
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  16. … 4 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
    • -0
    • +232
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -0
    • +328
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ToolContentListAction.java
    • -0
    • +157
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
    • -5
    • +34
    /lams_build/build_base.xml
    • -1
    • +2
    /lams_build/common.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +2
    /lams_build/liblist.txt
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -9
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
  16. … 19 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
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Wednesday 23 Aug 2017
2:55 am

Andrey Balan

Merge branch 'LDEV-4374'

Options
2:54 am

Andrey Balan

LDEV-4374 Hide search widget if there is less than 10 courses

If the number of active courses that user has access to is less

than 10 - we don't display search widget.

Options
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -6
    • +8
    /lams_central/web/main.jsp
Tuesday 22 Aug 2017
9:51 pm

Andrey Balan

Merge branch 'LDEV-4357'

Options
9:49 pm

Andrey Balan

LDEV-4357 Disable "Move learner to" button when no users selected

The root problem was that diaplog's 'open' method wasn't called in case

dialog gets opened for the second time.

Options
    • -4
    • +4
    /lams_central/web/includes/javascript/dialog.js
7:10 pm

Marcin Cieslak

Merge branch 'LDEV-4410'

Options
7:09 pm

Marcin Cieslak

LDEV-4410 Add unique key to prevent duplicate results

Options
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
12:56 pm

Marcin Cieslak

Merge branch 'master' into LDEV-4366

Options
    • -5
    • +1
    /lams_learning/web/WEB-INF/struts-config.xml