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 23 Oct 2018
2:36 am

Andrey Balan

LDEV-4698 Remove Apache httpcomponents source code

Options
    • -64
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AUTH.java
    • -63
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthOption.java
    • -33
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthProtocolState.java
    • -130
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthScheme.java
    • -51
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeFactory.java
    • -46
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeProvider.java
    • -157
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeRegistry.java
    • -328
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthScope.java
    • -235
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthState.java
    • -70
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthenticationException.java
    • -90
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/BasicUserPrincipal.java
    • -38
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/ChallengeState.java
    • -62
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/ContextAwareAuthScheme.java
    • -44
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/Credentials.java
    • -69
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/InvalidCredentialsException.java
  16. … 561 more files in changeset.
2:34 am

Andrey Balan

LDEV-4698 Stop using Apache httpcomponents library in LAMS

Options
    • -2
    • +0
    /lams_build/build_base.xml
    • -1
    • +0
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -2
    • +0
    /lams_central/.classpath
    • -31
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -36
    • +30
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Monday 22 Oct 2018
3:33 pm

Marcin Cieslak

LDEV-4691 Fix file uploads

MultipartFilter was introduced for LAMS servlets to work with Spring

MVC. It appears that for WildFly 14 it is not required anymore.

Furthermore, without it will not work without extra configuration. It

was removed.

Also a controller method was rewritten to Spring MVC style.

Options
    • -25
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -17
    • +1
    /lams_central/web/WEB-INF/web.xml
Friday 19 Oct 2018
7:53 pm

Marcin Cieslak

Merge branch 'LDEV-4694' into LDEV-4440

Options
7:48 pm

Marcin Cieslak

LDEV-4694 Remove obsolete embedded MySQL configuration

Options
    • -11
    • +0
    /lams_build/build.xml
    • -18
    • +0
    /lams_build/common.properties
    • -13
    • +0
    /lams_build/conf/domain.xml
    • -13
    • +0
    /lams_build/conf/slim/standalone.xml
    • -13
    • +0
    /lams_build/conf/standalone.xml
    • -1
    • +1
    /lams_common/build.xml
6:52 pm

Marcin Cieslak

LDEV-4691 Use a memory, non-transactional cache for HTTP sessions

Options
    • -11
    • +22
    /lams_build/conf/standalone.xml
5:38 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

Options
    • -2
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -1
    • +3
    /lams_admin/web/sessionmaintain.jsp
    • -0
    • +1
    /lams_build/build.xml
    • -11
    • +10
    /lams_build/build_base.xml
    • -6
    • +0
    /lams_build/build_tools_base.xml
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -9
    • +9
    /lams_central/web/outcome/outcomeEdit.jsp
    • -9
    • +8
    /lams_central/web/outcome/outcomeManage.jsp
    • -9
    • +9
    /lams_central/web/outcome/scaleEdit.jsp
    • -9
    • +8
    /lams_central/web/outcome/scaleManage.jsp
    • -0
    • +2
    /lams_common/build.xml
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  16. … 3 more files in changeset.
4:21 pm

Marcin Cieslak

Merge branch 'LDEV-4693' into lams31

Options
4:20 pm

Marcin Cieslak

LDEV-4693 Add name in logged in user list in sysadmin

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_admin/web/sessionmaintain.jsp
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
3:30 pm

Marcin Cieslak

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

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

Options
    • -13
    • +0
    /lams_build/build.xml
    • -11
    • +10
    /lams_build/build_base.xml
    • -6
    • +0
    /lams_build/build_tools_base.xml
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -8
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -1
    • +3
    /lams_common/build.xml
    • -1
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -5
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -9
    • +62
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
2:49 pm

Marcin Cieslak

LDEV-4609 Adjust columns for previous attempts in monitor activity view

Options
    • -9
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -5
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -12
    • +18
    /lams_gradebook/web/gradebookMonitor.jsp
10:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 TBLMonitoring links fixed

Options
    • -8
    • +6
    /lams_monitoring/web/monitor.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/forum.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/gates.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/peerreview.jsp
    • -3
    • +2
    /lams_monitoring/web/tblmonitor/sequence.jsp
    • -6
    • +5
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/teams.jsp
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java
4:59 am

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

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

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -1
    • +5
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +43
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -11
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -3
    • +31
    /lams_central/web/WEB-INF/struts-config.xml
    • -0
    • +4
    /lams_central/web/main.jsp
    • -1
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +39
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +7
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -74
    • +127
    /lams_gradebook/web/gradebookMonitor.jsp
    • -1
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java
    • -1
    • +4
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -27
    • +0
    /lams_central/web/css/outcome.css
4:41 am

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4609'

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java

lams_gradebook/web/gradebookMonitor.jsp

Options
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -4
    • +70
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -43
    • +63
    /lams_gradebook/web/gradebookMonitor.jsp
4:34 am

Marcin Cieslak

LDEV-4691 Rewrite domain config file to comply with WF14 structure

Options
    • -218
    • +294
    /lams_build/conf/domain.xml
    • -29
    • +105
    /lams_build/conf/host.xml
Thursday 18 Oct 2018
10:32 pm

Marcin Cieslak

LDEV-4691 Update libraries for TestHarness

Options
    • binary
    /TestHarness4LAMS2/lib/jackson-core-2.7.4.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-core-2.9.5.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-databind-2.7.4.jar
    • binary
    /TestHarness4LAMS2/lib/jackson-databind-2.9.5.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.3.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.3.2.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-servlet-api_3.1_spec-1.0.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-servlet-api_4.0_spec-1.0.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.1.Final.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.3.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-1.4.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-2.0.13.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-1.4.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-2.0.13.Final.jar
10:14 pm

Marcin Cieslak

LDEV-4691 Update source code of 3rd party libraries

Options
    • -18
    • +25
    /3rdParty_sources/commons-io/org/apache/commons/io/ByteOrderMark.java
    • -153
    • +192
    /3rdParty_sources/commons-io/org/apache/commons/io/Charsets.java
    • -30
    • +92
    /3rdParty_sources/commons-io/org/apache/commons/io/CopyUtils.java
    • -38
    • +44
    /3rdParty_sources/commons-io/org/apache/commons/io/DirectoryWalker.java
    • -60
    • +54
    /3rdParty_sources/commons-io/org/apache/commons/io/EndianUtils.java
    • -7
    • +8
    /3rdParty_sources/commons-io/org/apache/commons/io/FileCleaner.java
    • -14
    • +20
    /3rdParty_sources/commons-io/org/apache/commons/io/FileCleaningTracker.java
    • -8
    • +8
    /3rdParty_sources/commons-io/org/apache/commons/io/FileDeleteStrategy.java
    • -3
    • +3
    /3rdParty_sources/commons-io/org/apache/commons/io/FileExistsException.java
    • -73
    • +76
    /3rdParty_sources/commons-io/org/apache/commons/io/FileSystemUtils.java
    • -730
    • +934
    /3rdParty_sources/commons-io/org/apache/commons/io/FileUtils.java
    • -328
    • +379
    /3rdParty_sources/commons-io/org/apache/commons/io/FilenameUtils.java
    • -11
    • +13
    /3rdParty_sources/commons-io/org/apache/commons/io/HexDump.java
    • -42
    • +40
    /3rdParty_sources/commons-io/org/apache/commons/io/IOCase.java
    • -9
    • +8
    /3rdParty_sources/commons-io/org/apache/commons/io/IOExceptionWithCause.java
  16. … 1864 more files in changeset.
9:42 pm

Marcin Cieslak

LDEV-4691 Rewrite config file to comply with WF14 structure

Options
    • -63
    • +178
    /lams_build/conf/standalone.xml
9:35 pm

Marcin Cieslak

LDEV-4691 Mark WF slimming as not yet implemented

Options
    • -2
    • +4
    /lams_build/build.xml
    • -495
    • +0
    /lams_build/conf/slim/standalone.xml
9:34 pm

Marcin Cieslak

LDEV-4691 Adjust classloader switch

Options
    • -7
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
8:59 pm

Marcin Cieslak

LDEV-4691 Stick to the default module definition

Options
    • -120
    • +0
    /lams_build/lib/jdk/jdk.module.xml
8:59 pm

Marcin Cieslak

LDEV-4691 Do not reference a library which is not provided anymore

Options
    • -1
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
8:58 pm

Marcin Cieslak

LDEV-4691 Use Hibernate 5.0.10 as the main version

If we put Hibernate 5.0.10 as an alternative version in a slot, then

WildFly will load Hibernate 5.3 by default and there will be a class

clash on server start. We need to enforce only one version.

Options
    • -29
    • +5
    /lams_build/build.xml
    • -1
    • +1
    /lams_build/lib/hibernate/hibernate.module.xml
8:53 pm

Marcin Cieslak

LDEV-4691 Reset a classloader when refreshing configuration cache

In WildFly 14 the Configuration bean can get created by one of LAMS EAR

modules, for example Image Gallery. This module's classloader does not

have access to java.sql.Connection. It should ask its parent for this

class, but context class loaders are not obliged to do it and apparently

WildFly module classloaders do not do it. We need to manually reset a

classloader for the given thread.

Options
    • -3
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
Wednesday 17 Oct 2018
3:58 pm

Marcin Cieslak

LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

Options
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -0
    • +10
    /lams_build/build.xml
    • -5
    • +4
    /lams_build/build_base.xml
    • binary
    /lams_build/lib/hibernate/hibernate-core-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-entitymanager-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-envers-5.0.10.Final.jar
    • binary
    /lams_build/lib/hibernate/hibernate-java8-5.0.10.Final.jar
    • -0
    • +55
    /lams_build/lib/hibernate/hibernate.module.xml
    • -5
    • +0
    /lams_central/.classpath
    • -5
    • +0
    /lams_common/.classpath
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
    • -5
    • +0
    /lams_contentrepository/.classpath
    • -5
    • +0
    /lams_gradebook/.classpath
    • -5
    • +0
    /lams_learning/.classpath
    • -5
    • +0
    /lams_tool_assessment/.classpath
  16. … 30 more files in changeset.
3:07 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Save works, can edit acts after gate, learner msg improvement

Options
    • -7
    • +7
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
2:58 pm

Marcin Cieslak

LDEV-4691 Update libraries provided by WildFly

Options
    • -7
    • +7
    /TestHarness4LAMS2/.classpath
    • -6
    • +6
    /lams_admin/.classpath
    • -1
    • +1
    /lams_build/deploy-tool/deploy.bat
    • -1
    • +1
    /lams_build/deploy-tool/deploy.sh
    • binary
    /lams_build/deploy-tool/lib/commons-io-2.4.jar
    • binary
    /lams_build/deploy-tool/lib/commons-io-2.5.jar
    • binary
    /lams_build/deploy-tool/lib/lams-tool-deploy.jar
    • -16
    • +17
    /lams_central/.classpath
    • -1
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -20
    • +21
    /lams_common/.classpath
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
    • -3
    • +4
    /lams_contentrepository/.classpath
    • -5
    • +6
    /lams_gradebook/.classpath
    • -8
    • +8
    /lams_learning/.classpath
    • -5
    • +5
    /lams_monitoring/.classpath
  16. … 33 more files in changeset.
Monday 15 Oct 2018
7:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -11
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +1
    /lams_monitoring/web/grouping/chosenGrouping.jsp
    • -3
    • +51
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -8
    • +17
    /lams_monitoring/web/monitor.jsp
Saturday 13 Oct 2018
2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4668 Only display Finish button when in resources completed

Options
    • -0
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
    • -6
    • +19
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
    • -9
    • +5
    /lams_tool_larsrc/web/pages/learning/learning.jsp
5:09 am

Andrey Balan

LDEV-4670 add maxlength limit to the image title's input

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
    • -1
    • +1
    /lams_tool_images/web/pages/authoring/parts/addimage.jsp