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 31 Oct 2017
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    /lams_learning/build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    /lams_learning/build.xml
12:59 am

Marcin Cieslak

LDEV-4453 Add "gradebook on lesson complete" field to Lesson

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -8
    • +13
    /lams_central/web/addLesson.jsp
    • -0
    • +3
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171030.sql
    • -5
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
    • -7
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -63
    • +74
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +12
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
Monday 30 Oct 2017
3:50 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -8
    • +97
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +24
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +25
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml
    • -30
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
  16. … 223 more files in changeset.
1:18 am

Marcin Cieslak

LDEV-4411 Enable and configure Hibernate 2nd level cache

This configuration is only for standalone mode. It is explained in JIRA

comments.

Options
    • -25
    • +5
    /lams_build/conf/standalone.xml
    • -11
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
Thursday 26 Oct 2017
1:12 pm

Marcin Cieslak

Merge branch 'LDEV-4452'

Options
1:11 pm

Marcin Cieslak

LDEV-4452 Prompt on overwriting unsaved changes in Authoring

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +6
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
7:29 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
7:17 am

Andrey Balan

LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

Options
    • -0
    • +80
    /lams_central/src/java/org/lamsfoundation/lams/web/ConfidenceLevelServlet.java
    • -0
    • +41
    /lams_central/web/css/bootstrap-slider.css
    • -0
    • +5
    /lams_central/web/includes/javascript/bootstrap-slider.js
    • -0
    • +8
    /lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +9
    /lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -8
    • +97
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
  16. … 15 more files in changeset.
6:55 am

Andrey Balan

LDEV-4451 Create Confidence level system

Create Confidence level classes similar to the Ratings ones, that we

already have. They must be located in lams_common folder as it's going

to be used by 3 tools: learners are going to enter them in Assessment

and MCQ, and we later display them in all three tools.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +64
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/confidencelevel/ConfidenceLevel.hbm.xml
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +85
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevel.java
    • -0
    • +51
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dao/IConfidenceLevelDAO.java
    • -0
    • +109
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dao/hibernate/ConfidenceLevelDAO.java
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dto/ConfidenceLevelDTO.java
    • -0
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dto/QuestionConfidenceLevelDTO.java
    • -0
    • +145
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/service/ConfidenceLevelService.java
    • -0
    • +73
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/service/IConfidenceLevelService.java
    • -0
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171016.sql
Wednesday 25 Oct 2017
5:50 pm

Marcin Cieslak

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

Rewrite Kumalive JSON code to Jackson

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +332
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -0
    • +566
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +61
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +556
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -18
    • +49
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
8:57 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Small UI change

Options
    • -9
    • +12
    /lams_central/web/groupHeader.jsp
Tuesday 24 Oct 2017
9:53 pm

Marcin Cieslak

LDEV-4366 Disable learner's button when Kumalive is not started

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -26
    • +37
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -3
    • +25
    /lams_central/web/groupHeader.jsp
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
3:52 pm

Marcin Cieslak

LDEV-4440 Fix Vote statistics URL

Struts considered absolute URLs relative to module context, for example

/monitoring/stats.do translates into

http://localhost/lams/tool/lavote11/monitoring/stats.do

Spring considers absolute URLs relative to server context, for example

/monitoring/stats.do translates into

http://localhost/lams/monitoring/stats.do

Because of this URLs (ajax, form actions etc.) need to be rewritten when

migrating to Spring.

Options
    • -1
    • +1
    /lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
5:19 am

Andrey Balan

LDEV-4448 Improve SQL query that is used to change tool outputs

Changing Assessment's tool output to 'First score' was taking too much

time. So the query that returns 'First score' outputs for the entire

activity was rewritten to improve its performance.

Options
    • -6
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
12:06 am

Marcin Cieslak

Merge branch 'LDEV-4447'

Options
12:05 am

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
    • -0
    • +7
    /lams_admin/web/organisation/createOrEdit.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171023.sql
    • -1
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
Monday 23 Oct 2017
11:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • binary
    /lams_build/lib/lams/lams.jar
    • -5
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171023.sql
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -0
    • +50
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -0
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
11:00 pm

Marcin Cieslak

LDEV-4440 Add missing URLs to Vote tool

Options
    • -0
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
2:12 pm

Marcin Cieslak

LDEV-4440 Change tool access URLs to reflect migration to Spring MVC

Options
    • -0
    • +21
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
2:29 am

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -0
    • +34
    /lams_central/web/includes/javascript/main.js
    • -2
    • +41
    /lams_learning/conf/language/lams/ApplicationResources.properties
Sunday 22 Oct 2017
3:09 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4408 adding missing labels

Adding missing label for deleting user sessions

Options
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
Friday 20 Oct 2017
4:15 am

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • -0
    • +183
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java
    • -0
    • +108
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
    • -30
    • +30
    /lams_tool_vote/.classpath
    • -33
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -2
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -37
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java
    • -1338
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +1231
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -51
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +67
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java
    • -1086
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +1002
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -562
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +514
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
  16. … 53 more files in changeset.
4:15 am

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -0
    • +38
    /lams_build/noStruts.userlibraries
3:44 am

Marcin Cieslak

LDEV-4402 Fix an incorrect property in JSON

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
Wednesday 18 Oct 2017
3:53 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Updating greek

Options
    • -2
    • +6
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
Tuesday 17 Oct 2017
7:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -3
    • +3
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -22
    • +31
    /lams_central/web/css/_learner_base.scss
    • -0
    • +5
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -0
    • +11
    /lams_central/web/includes/javascript/free.jquery.jqgrid.min.js
    • -1
    • +2
    /lams_central/web/includes/javascript/main.js
    • -0
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -55
    • +29
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -104
    • +94
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -48
    • +30
    /lams_gradebook/web/gradebookMonitor.jsp
    • -13
    • +4
    /lams_gradebook/web/includes/css/gradebook.scss
    • -14
    • +32
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
    • -11
    • +14
    /lams_monitoring/web/emailnotifications/courseNotifications.jsp
    • -9
    • +13
    /lams_monitoring/web/emailnotifications/lessonNotifications.jsp
    • -5
    • +0
    /lams_monitoring/web/monitor.jsp
Monday 16 Oct 2017
8:13 pm

Marcin Cieslak

LDEV-4440 Update Spring source code

Options
    • -9
    • +8
    /3rdParty_sources/spring/org/springframework/aop/TargetSource.java
    • -10
    • +10
    /3rdParty_sources/spring/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
    • -13
    • +10
    /3rdParty_sources/spring/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
    • -5
    • +2
    /3rdParty_sources/spring/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
    • -13
    • +5
    /3rdParty_sources/spring/org/springframework/aop/support/ComposablePointcut.java
    • -1
    • +1
    /3rdParty_sources/spring/org/springframework/aop/support/NameMatchMethodPointcut.java
    • -18
    • +9
    /3rdParty_sources/spring/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
    • -2
    • +2
    /3rdParty_sources/spring/org/springframework/asm/SpringAsmInfo.java
    • -6
    • +4
    /3rdParty_sources/spring/org/springframework/beans/AbstractNestablePropertyAccessor.java
    • -5
    • +3
    /3rdParty_sources/spring/org/springframework/beans/PropertyAccessor.java
    • -17
    • +17
    /3rdParty_sources/spring/org/springframework/beans/factory/BeanFactory.java
    • -5
    • +6
    /3rdParty_sources/spring/org/springframework/beans/factory/CannotLoadBeanClassException.java
    • -1
    • +2
    /3rdParty_sources/spring/org/springframework/beans/factory/config/BeanDefinition.java
    • -3
    • +5
    /3rdParty_sources/spring/org/springframework/beans/factory/config/DependencyDescriptor.java
    • -5
    • +5
    /3rdParty_sources/spring/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
  16. … 582 more files in changeset.
6:58 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: Ooops

swap file shouldn't have been committed. Too many terminals open :-)

Options
    • binary
    /lams_tool_assessment/web/pages/monitoring/.editactivity.jsp.swp