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
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
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

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

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

Options
    • -141
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
    • -73
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/DisabledUserManageAction.java
    • -60
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelAction.java
    • -55
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelForm.java
    • -108
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
    • -95
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java
    • -78
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java
    • -232
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
    • -130
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java
    • -265
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
    • -179
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
    • -62
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java
    • -111
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
    • -55
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java
    • -88
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
  16. … 62 more files in changeset.
12:52 am

Marcin Cieslak

LDEV-4366 Use new portrait API

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -41
    • +21
    /lams_learning/web/css/kumalive.scss
    • -17
    • +5
    /lams_learning/web/includes/javascript/kumalive.js
Thursday 17 Aug 2017
11:23 pm

Marcin Cieslak

LDEV-4366 Hide all rubric marks on question finish

Options
    • -1
    • +4
    /lams_learning/web/includes/javascript/kumalive.js
11:17 pm

Marcin Cieslak

LDEV-4366 Hide "no mark" button

Options
    • -1
    • +0
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_learning/web/includes/javascript/kumalive.js
    • -1
    • +0
    /lams_learning/web/kumalive/kumalive.jsp
11:14 pm

Marcin Cieslak

LDEV-4366 Make all rubrics checked by defaul on new Kumalive create

Also hide rubrics box if there are no rubrics defined.

Options
    • -1
    • +4
    /lams_learning/web/includes/javascript/kumalive.js
8:43 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4399 Fixing vertical alignment of answers.

Options
8:29 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4399 Fixing vertical alignment of answers.

Also tweaking the columns of the revisited learner page to

make the sorting arrows appear correctly.

Options
    • -3
    • +3
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -8
    • +18
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
12:33 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to tool.vote.web.action package; exception to

tool.vote.web.util.

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

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

Options
    • -0
    • +1
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -78
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java
    • -1
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -0
    • +78
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteApplicationException.java
    • -1338
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
    • -51
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
    • -1084
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -554
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -120
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
    • -128
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
    • -0
    • +1338
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +51
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +1084
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +554
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +120
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +128
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
    • -6
    • +6
    /lams_tool_vote/web/WEB-INF/struts-config.xml
12:10 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to tool.sbmt.web.action package; forms to

tool.sbmt.web.form; exception to tool.sbmt.web.util, SbmtConstants to

tool.sbmt.

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

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

Options
    • -0
    • +106
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
    • -71
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/exception/SubmitFilesException.java
    • -180
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java
    • -45
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java
    • -131
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/MarkForm.java
    • -87
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java
    • -60
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/SubmitFilesPedagogicalPlannerForm.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesOutputFactory.java
    • -2
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -106
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
    • -0
    • +71
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SubmitFilesException.java
    • -238
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
    • -48
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ClearSessionAction.java
  16. … 20 more files in changeset.