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 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.
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
12:30 pm

Marcin Cieslak

LDEV-4393 Fix parameter flow for lesson notebook

Current lesson ID was not retained during submits. It has to be present

on each page and submit so "view all" page knows where to add a new

entry.

Options
    • -12
    • +12
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -5
    • +1
    /lams_learning/web/WEB-INF/struts-config.xml
    • -0
    • +1
    /lams_learning/web/notebook/addnew.jsp
    • -3
    • +7
    /lams_learning/web/notebook/view.jsp
    • -12
    • +10
    /lams_learning/web/notebook/viewall.jsp
Monday 21 Aug 2017
11:02 pm

Andrey Balan

LDEV-4409 Clear Short answer' result if it's incorrectly answered

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
9:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Portrait will not tile and improved Generic spacing

Options
    • -4
    • +4
    /lams_central/web/css/_learner_base.scss
9:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Further tweaks to suit Forum changes

Options
    • -1
    • +1
    /lams_central/web/css/_learner_base.scss
8:29 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Portrait will not tile and improved Generic spacing

Options
    • -2
    • +5
    /lams_central/conf/scss/_mixins.scss
    • -4
    • +4
    /lams_central/web/css/_learner_base.scss
12:37 am

Marcin Cieslak

LDEV-4366 Smooth animation with properly resized portraits

Options
    • -7
    • +7
    /lams_learning/web/css/kumalive.scss
    • -14
    • +15
    /lams_learning/web/includes/javascript/kumalive.js
    • -0
    • +1
    /lams_learning/web/kumalive/kumalive.jsp
12:37 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4366 Portrait picture tweaks

Options
    • -2
    • +5
    /lams_central/conf/scss/_mixins.scss
    • -4
    • +4
    /lams_central/web/css/_learner_base.scss
Friday 18 Aug 2017
4:56 am

Andrey Balan

Merge branch 'LDEV-4407'

Options
4:04 am

Andrey Balan

LDEV-4407 Move ContributeDTOFactory to the proper package

ContributeDTOFactory were moved to

org.lamsfoundation.lams.monitoring.service package.

(To access file's earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -170
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -1
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -0
    • +170
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
3:52 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Servlet classes were moved to learning.web.servlet package.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -81
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java
    • -218
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +81
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -0
    • +218
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
    • -2
    • +2
    /lams_learning/web/WEB-INF/web.xml
3:46 am

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

Options
    • binary
    /lams_build/lib/lams/lams-contentrepository.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.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/webservice/xml/LearningDesignRepositoryServlet.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
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -73
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/AccessDeniedException.java
    • -0
    • +2
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CheckCredentialTicketBeforeAdvice.java
    • -0
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java
    • -0
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java
    • -74
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/FileException.java
    • -0
    • +2
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IValue.java
  16. … 52 more files in changeset.
3:10 am

Andrey Balan

LDEV-4407 Remove obsolete OrgManageBean class

Options
    • -130
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/OrgManageBean.java
    • -3
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserBean.java
    • -24
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java