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
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
5:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

Options
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • binary
    /lams_tool_assessment/web/pages/monitoring/.editactivity.jsp.swp
    • -0
    • +4
    /lams_tool_assessment/web/pages/monitoring/editactivity.jsp
    • -2
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_lamc/web/monitoring/Edit.jsp
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
    • -2
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_vote/web/monitoring/Edit.jsp
5:33 pm

Marcin Cieslak

LDEV-4440 Rewrite configuration of an example tool

Struts servlet gets replaced with Spring one. It has its own

configuration in a separate XML file.

Options
    • -0
    • +17
    /lams_tool_vote/web/WEB-INF/spring-servlet.xml
    • -25
    • +11
    /lams_tool_vote/web/WEB-INF/web.xml
11:19 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4437 Propogates Monitor Leader mark changes to group members

Options
    • -0
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -20
    • +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
Saturday 14 Oct 2017
8:59 pm

Marcin Cieslak

LDEV-4400, LDEV-3315 Comment out a test parameter

It should be uncommented only for TestHarness.

Options
    • -11
    • +22
    /lams_build/conf/host.xml
8:51 pm

Marcin Cieslak

LDEV-4400, LDEV-3315 Toggle session ID change for each LAMS module

WildFly 10 changes session ID after authentication by default in order

to prevent session fixation attack. It breaks TestHarness, though. In

order to run TH, session ID change needs to be turned off.

Turning it off for Central is not enough as a request to any other

module, like Tool, triggers session ID change. In this case we need to

have session ID change turned on or off in each LAMS module, not just

Central.

Options
    • -1
    • +9
    /lams_build/build_base.xml
    • -0
    • +1
    /lams_build/conf/deployment-handler/io.undertow.servlet.ServletExtension
    • -10
    • +15
    /lams_build/conf/host.xml
    • -0
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/CommonDeploymentHandler.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
4:48 am

Andrey Balan

Merge branch 'LDEV-4441'

Options
4:47 am

Andrey Balan

LDEV-4441 CKEditor bootsnippets plugin to support i18n

Make bootsnippets plugin to support i18n. Besides of the plugin's

internal labels, we're also going to translate labels from

/lams_www/web/public/ckeditor-templates/bootsnippets.js (but only

snippets' titles).

Options
    • -1
    • +29
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +42
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/es.js
    • -0
    • +42
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/gr.js
    • -0
    • +42
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/ru.js
    • -9
    • +9
    /lams_central/web/ckeditor/plugins/bootsnippets/plugin.js
    • -24
    • +24
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
Friday 13 Oct 2017
9:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -12
    • +14
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
9:40 pm

Marcin Cieslak

LDEV-4400 Remove an unnecessary import as it fails JSP compilation

Options
    • -1
    • +0
    /lams_tool_wiki/web/login.jsp
9:26 pm

Marcin Cieslak

LDEV-4440 Upgrade Spring to version 4.3.12

Add Spring MVC module.

Options
    • -8
    • +11
    /lams_build/3rdParty.userlibraries
    • binary
    /lams_build/lib/spring/spring-aop-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-aop-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-beans-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-beans-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-context-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-context-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-context-support-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-context-support-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-core-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-core-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-expression-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-expression-4.3.12.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-jdbc-4.3.10.RELEASE.jar
    • binary
    /lams_build/lib/spring/spring-jdbc-4.3.12.RELEASE.jar
  16. … 10 more files in changeset.
8:02 pm

Marcin Cieslak

Fix merged lams.jar

Options
    • binary
    /lams_build/lib/lams/lams.jar
8:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -26
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -34
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.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
    • -10
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
1:48 pm

Marcin Cieslak

Merge branch 'LDEV-4439'

Options
1:47 pm

Marcin Cieslak

LDEV-4439 Fix a typo in optional activity properties init code

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
Thursday 12 Oct 2017
10:57 pm

Andrey Balan

LDEV-4438 Remove unique constraint added in the previous patch

The new constraint handles all problematic cases including the one with

copying results from leaders. Thus we no longer need

UQ_tl_laasse10_assessment_result_4 (assessment_uid, user_uid,

finish_date) constraint.

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
11:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Spanish for various projects

Options
    • -9
    • +9
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +8
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
7:39 am

Andrey Balan

LDEV-4438 fix autopatch script typo

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
3:29 am

Andrey Balan

Merge branch 'LDEV-4438'

Options
3:27 am

Andrey Balan

LDEV-4438 Add unique constraint (assessment_uid, user_uid, latest)

Add unique constraint (assessment_uid, user_uid, latest) to

tl_laasse10_assessment_result which will apply only in case latest=1. It

was done by making 'latest' field contain only NULL or 1 (as opposite to

the previously used 0 or 1). This way constraint will apply only in

cases when 'latest' is 1.

Options
    • -0
    • +31
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 11 Oct 2017
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4415' Marks can now be weighted

Options
    • -0
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
1:27 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4435 Portraits displayed for View Learners grouping option

Options
    • -4
    • +10
    /lams_learning/web/grouping/choose.jsp
12:48 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Adding Greek

Adding Greek to peer review tool

Options
    • -0
    • +177
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
12:46 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and Norwegian

Options
    • -2
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +9
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties