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
Thursday 15 Dec 2016
7:30 pm

Marcin Cieslak

LDEV-3646: Make sure that a websocket is open before sending any messages.

Options
    • -1
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
7:29 pm

Marcin Cieslak

LDEV-4107: Once one learner gets a confirmation that Scratchie is finished, he marks the tool session as finished for everyone. This prevent leaving out learners who did not get the confirmation because their websockets were still being set up.

Options
    • -6
    • +9
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
2:51 am

Marcin Cieslak

LDEV-4107: Use websockets in Scratchie testing.

Options
    • -100
    • +129
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -4
    • +4
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/WebsocketClient.java
    • -3
    • +6
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
2:50 am

Marcin Cieslak

LDEV-3971: Use separate transaction to create a tool session as otherwise duplicate attempt & retry cancels whole business logic.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
1:16 am

Andrey Balan

LDEV-4149 Added CSS rule to be able to see entire navbar which gets enlarged at 1330px

Options
    • -0
    • +5
    /lams_central/web/css/thickbox.css
Wednesday 14 Dec 2016
7:22 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4145: Comments made in monitoring now get a blue background. Also tweaked comment layout so that the replies do not go outside the panel border.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -5
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +1
    /lams_central/web/comments/comments.jsp
    • -7
    • +20
    /lams_central/web/comments/msgview.jsp
    • -1
    • +2
    /lams_central/web/comments/topicview.jsp
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040080.sql
7:13 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4145: Tweaking comment layout so that the replies do not go outside the panel border.

Options
    • -10
    • +7
    /lams_tool_nb/web/reflect.jsp
3:16 pm

Marcin Cieslak

LDEV-3997: Add updated source code for Apache HttpClient and HttpCore.

Options
    • -203
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/AutoCloseInputStream.java
    • -373
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ChunkedInputStream.java
    • -202
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ChunkedOutputStream.java
    • -68
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/CircularRedirectException.java
    • -260
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ConnectMethod.java
    • -76
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ConnectTimeoutException.java
    • -70
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ConnectionPoolTimeoutException.java
    • -220
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/ContentLengthInputStream.java
    • -536
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/Cookie.java
    • -44
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/Credentials.java
    • -148
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/DefaultHttpMethodRetryHandler.java
    • -102
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/DefaultMethodRetryHandler.java
    • -145
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/Header.java
    • -299
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/HeaderElement.java
    • -230
    • +0
    /3rdParty_sources/commons-httpclient/org/apache/commons/httpclient/HeaderGroup.java
  16. … 649 more files in changeset.
9:30 am

erniegx <ernieg@gmail.com>

LDEV-4023: missing label and moved labels to admin which were incorrectly added to central

Options
    • -4
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -4
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
6:59 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

Options
    • -1
    • +12
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
    • -0
    • +1
    /lams_tool_chat/web/pages/monitoring/summary.jsp
    • -0
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -1
    • +8
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -0
    • +1
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java
    • -1
    • +10
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/MonitoringAction.java
    • -0
    • +1
    /lams_tool_kaltura/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -2
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -1
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
    • -0
    • +1
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
    • -0
    • +1
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java
    • -2
    • +7
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
    • -0
    • +1
    /lams_tool_mindmap/web/pages/monitoring/summary.jsp
  16. … 24 more files in changeset.
6:40 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

Options
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -1
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +1
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
Tuesday 13 Dec 2016
10:34 pm

Marcin Cieslak

LDEV-4127: Remove default tool conditions. Fix conditions refresh in Authoring.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -4
    • +4
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -5
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -17
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -9
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -2
    • +1
    /lams_tool_chat/conf/language/lams/ApplicationResources.properties
    • -17
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
    • -4
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -1
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java
    • -1
    • +0
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -33
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
    • -7
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -1
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -1
    • +0
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
  16. … 14 more files in changeset.
9:49 pm

Andrey Balan

LDEV-4148 * Passing userId of the person who initiated cloning to startLesson() method in order to pass security check * modified a few methods to stop returning non-needed variables

Options
    • -4
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -11
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
4:39 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3676: Update My profile pages.

Options
    • -1
    • +1
    /lams_central/web/profile.jsp
1:55 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

Options
    • -4
    • +14
    /lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -2
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
    • -0
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
    • -0
    • +1
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
12:42 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3322:Add tag ids to facilitate selenium functional testing

Options
    • -2
    • +2
    /lams_learning/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
  16. … 13 more files in changeset.
11:59 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3322:Add tag ids to facilitate selenium functional testing

Options
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
11:49 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3322:Add tag ids to facilitate selenium functional testing

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/AuthoringButton.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/AuthoringButton.tag
11:43 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4143 :Error on save when no Flash player

Options
    • -2
    • +2
    /lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +1
    /lams_tool_mindmap/web/pages/authoring/authoring.jsp
11:37 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4143 :Error on save when no Flash player

Options
    • -2
    • +4
    /lams_tool_mindmap/web/pages/learning/mindmap.jsp
10:40 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4143 :Error on save when no Flash player

Options
    • -1
    • +3
    /lams_tool_mindmap/web/pages/authoring/basic.jsp
10:03 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4143 :Error on save when no Flash player

Options
    • -1
    • +1
    /lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +4
    /lams_tool_mindmap/web/pages/authoring/authoring.jsp
    • -3
    • +3
    /lams_tool_mindmap/web/pages/authoring/basic.jsp
8:26 am

erniegx <ernieg@gmail.com>

LDEV-3801: adding labels

Options
    • -2
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
7:14 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4141: Converting tablesorter to bootstrap style

Options
    • -98
    • +52
    /lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
7:14 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4141: Fixed typo that stops page loading when submission deadline has passed - found while bootstrapping the tablesorter.

Options
    • -1
    • +1
    /lams_tool_survey/web/pages/learning/submissionDeadline.jsp
1:48 am

Marcin Cieslak

LDEV-4107: Initial websocket client implementation based on Undertow libraries. Learners in Chat send few messages and also receive and log message history from the server.

Options
    • -0
    • +7
    /TestHarness4LAMS2/.classpath
    • binary
    /TestHarness4LAMS2/lib/jboss-logging-3.1.4.GA.jar
    • binary
    /TestHarness4LAMS2/lib/jboss-websocket-api_1.1_spec-1.1.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-core-1.1.8.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-servlet-1.1.8.Final.jar
    • binary
    /TestHarness4LAMS2/lib/undertow-websockets-jsr-1.1.8.Final.jar
    • binary
    /TestHarness4LAMS2/lib/xnio-api-3.3.0.Final.jar
    • binary
    /TestHarness4LAMS2/lib/xnio-nio-3.3.0.Final.jar
    • -10
    • +32
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -0
    • +79
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/WebsocketClient.java
12:54 am

Andrey Balan

LDEV-3801 store time limit's launched date in DB

Options
    • -0
    • +5
    /lams_tool_scratchie/.classpath
    • -1
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    /lams_tool_scratchie/conf/xdoclet/struts-actions.xml
    • -0
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +63
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +53
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -49
    • +124
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -14
    • +30
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +15
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -0
    • +42
    /lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp
Monday 12 Dec 2016
11:38 pm

erniegx <ernieg@gmail.com>

LDEV-3832 Adding labels

Options
    • -4
    • +4
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
4:59 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4142:QA required answer in learner more explicitly clear after submit

Options
    • -8
    • +10
    /lams_tool_laqa/web/learning/AnswersContent.jsp
4:30 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4140:Q&A doesn't save option "answer is required" when entering a question

Options
    • -7
    • +4
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp