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 12 Dec 2013
6:07 am

Andrey Balan

LKC-40 re-issue a transaction if it fails due to deadlock

Options
    • -34
    • +95
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
3:46 am

Andrey Balan

LKC-40 re-issue a transaction if it fails due to deadlock

Options
    • -1
    • +21
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
1:56 am

Andrey Balan

LKC-40 do not save ScratchieUser into SessionMap

Options
    • -2
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -11
    • +29
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
12:23 am

Andrey Balan

LKC-40 Removed resundant line

Options
    • -1
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Wednesday 11 Dec 2013
7:47 pm

Marcin Cieslak

LDEV-3156: Assign created lesson to proper organisation. Support MCQ and Assessment Tools.

Options
    • -2
    • +16
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
7:41 pm

Marcin Cieslak

LDEV-3156: Assign created lesson to proper organisation. Support MCQ and Assessment Tools.

Options
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/AbstractTest$1.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/AbstractTest.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/MockUser$HashUtil.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/MockUser.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/TestSuite.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/learner/MockLearner.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/monitor/MockMonitor.class
    • binary
    /TestHarness4LAMS2/build/org/lamsfoundation/testharness/monitor/MonitorTest.class
    • -2
    • +2
    /TestHarness4LAMS2/monitorTest1.properties
    • -5
    • +17
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
    • -3
    • +6
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java
    • -106
    • +99
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java
    • binary
    /lams_build/lib/lams/lams.jar
    • -160
    • +145
    /lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
5:07 am

Andrey Balan

LKC-40 Removed readonly Hibernate transactions for readonly methods and now it's all handled by creation of transactions by DB itself

Options
    • -4
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
2:00 am

Marcin Cieslak

LDEV-3156: Allow multiple questions in Scratchie.

Options
    • -9
    • +19
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
1:07 am

Marcin Cieslak

LDEV-3156: Put back missing methods, removed along with Flash Monitoring. Manually add session cookies to WebConversation if it is not done automatically. Make TestHarness work with Leader and Scratchie tools.

Options
    • -0
    • +230
    /3rdParty_sources/httpunit/com/meterware/httpunit/AppletContextImpl.java
    • -0
    • +119
    /3rdParty_sources/httpunit/com/meterware/httpunit/AppletStubImpl.java
    • -0
    • +245
    /3rdParty_sources/httpunit/com/meterware/httpunit/AuthenticationChallenge.java
    • -0
    • +82
    /3rdParty_sources/httpunit/com/meterware/httpunit/AuthorizationRequiredException.java
    • -0
    • +100
    /3rdParty_sources/httpunit/com/meterware/httpunit/Base64.java
    • -0
    • +219
    /3rdParty_sources/httpunit/com/meterware/httpunit/BlockElement.java
    • -0
    • +233
    /3rdParty_sources/httpunit/com/meterware/httpunit/Button.java
    • -0
    • +322
    /3rdParty_sources/httpunit/com/meterware/httpunit/ClientProperties.java
    • -0
    • +30
    /3rdParty_sources/httpunit/com/meterware/httpunit/ContentConcealer.java
    • -0
    • +18
    /3rdParty_sources/httpunit/com/meterware/httpunit/DNSListener.java
    • -0
    • +45
    /3rdParty_sources/httpunit/com/meterware/httpunit/DialogAdapter.java
    • -0
    • +45
    /3rdParty_sources/httpunit/com/meterware/httpunit/DialogResponder.java
    • -0
    • +62
    /3rdParty_sources/httpunit/com/meterware/httpunit/ElementRegistry.java
    • -0
    • +249
    /3rdParty_sources/httpunit/com/meterware/httpunit/FixedURLWebRequestSource.java
    • -0
    • +1023
    /3rdParty_sources/httpunit/com/meterware/httpunit/FormControl.java
  16. … 221 more files in changeset.
Tuesday 10 Dec 2013
9:23 pm

Marcin Cieslak

LDEV-3021: Add finished learner group icon, no matter how many of them finished.

Options
    • -13
    • +11
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Friday 06 Dec 2013
10:49 pm

Andrey Balan

LKC-40 Divided scratching event into 2 separate actions: 1st is show the leader whether he guessed the right answer, 2nd is record this log into DB

Options
    • -2
    • +6
    /lams_tool_scratchie/conf/xdoclet/struts-actions.xml
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130912.sql
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -24
    • +30
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -3
    • +9
    /lams_tool_scratchie/web/pages/learning/learning.jsp
3:39 am

Andrey Balan

LDEV-3144 fixed search feature

Options
    • -0
    • +7
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -1
    • +1
    /lams_gradebook/web/gradebookCourseMonitor.jsp
Thursday 05 Dec 2013
8:52 pm

Marcin Cieslak

LDEV-3119: Fix a bug in check for duplicate organisations. Make group containers less tolerant when dragging users over, so the operator knows exactly where he drops them.

Options
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    /lams_central/web/includes/javascript/orgGroup.js
1:01 am

Marcin Cieslak

LDEV-3154: Explicitly tell Ant to produce Java 1.6 code. Add a parameter preventing warnings.

Options
    • -2
    • +6
    /lams_build/build_base.xml
    • -1
    • +3
    /lams_tool_deploy/build.xml
12:03 am

Marcin Cieslak

LDEV-3115: Allow groupings in saved LDs. Prevent SVG icons from being processed by Batik library as it produces errors. Multiple minor fixes.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -12
    • +13
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -27
    • +111
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -4
    • +6
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -5
    • +8
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -29
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java
Wednesday 04 Dec 2013
5:02 am

Andrey Balan

LKC-40 Prevent massive load of DB when accessing tool with 20+ users

Options
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131130.sql
    • -0
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -1
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -22
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -87
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
4:30 am

Marcin Cieslak

LDEV-3115: Allow saving of LDs consisting of simple Tool activities. Fixes to JSON parsing. Activity colouring based on categories.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -184
    • +103
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -4
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -11
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -18
    • +4
    /lams_central/web/author2.jsp
    • -20
    • +28
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -29
    • +144
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -7
    • +20
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -8
    • +0
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -4
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
    • -7
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -0
    • +71
    /lams_common/src/java/org/lamsfoundation/lams/util/JsonUtil.java
Tuesday 03 Dec 2013
7:54 pm

Marcin Cieslak

LDEV-3021: Fix number of single-user icons so they do not overlap group of users icon. Minor improvements to JS code.

Options
    • -10
    • +10
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Monday 02 Dec 2013
4:14 am

Marcin Cieslak

LDEV-3115: Save LD preparations. Adapt ObjectExtractor so it reads from JSON. Add "Save" and "Save as" buttons. Allow choosing where to save the LD, along with some validation. Partial LD serialization.

Options
    • binary
    /lams_build/lib/lams/lams.jar
Friday 29 Nov 2013
9:32 pm

Marcin Cieslak

LDEV-3115: Save LD preparations. Adapt ObjectExtractor so it reads from JSON. Add "Save" and "Save as" buttons. Allow choosing where to save the LD, along with some validation. Partial LD serialization.

Options
    • -6
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java
    • -132
    • +1248
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -5
    • +62
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +18
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -2
    • +16
    /lams_central/web/author2.jsp
    • -1
    • +18
    /lams_central/web/css/authoring.css
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -31
    • +146
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -2
    • +35
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -0
    • +207
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
2:39 am

Andrey Balan

LDEV-3153 * Enlarge instructions field for Share Resource * removed prototype.js and rewrite methods to use jquery to avoid JS errors * improved UI

Options
    • -0
    • +13
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql
    • -52
    • +60
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java
    • -25
    • +7
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
    • -1
    • +0
    /lams_tool_larsrc/web/common/header.jsp
    • -1
    • +1
    /lams_tool_larsrc/web/common/tabbedheader.jsp
    • -11
    • +38
    /lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
    • -29
    • +26
    /lams_tool_larsrc/web/pages/authoring/basic.jsp
    • -13
    • +0
    /lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
    • -13
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
    • -13
    • +0
    /lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
    • -12
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
    • -20
    • +16
    /lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
    • -29
    • +21
    /lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
Wednesday 27 Nov 2013
1:30 am

Marcin Cieslak

LDEV-3115: Allow loading and remembering groups to branches mappings. Add Zoom Out button for presentation purposes. Add Canvas and Description tabs. Add a tip when user clicks Transition button. Multiple minor fixes.

Options
    • -21
    • +48
    /lams_central/web/author2.jsp
    • -4
    • +57
    /lams_central/web/css/authoring.css
    • -5
    • +9
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -6
    • +59
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +22
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -39
    • +69
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
Saturday 23 Nov 2013
1:46 am

Marcin Cieslak

WVI-57: Add assertion encryption. Update libraries and their source code reference. Fix minor bugs.

Options
    • -0
    • +119
    /3rdParty_sources/gson/com/google/gson/DefaultDateTypeAdapter.java
    • -0
    • +109
    /3rdParty_sources/gson/com/google/gson/ExclusionStrategy.java
    • -0
    • +157
    /3rdParty_sources/gson/com/google/gson/FieldAttributes.java
    • -0
    • +168
    /3rdParty_sources/gson/com/google/gson/FieldNamingPolicy.java
    • -0
    • +40
    /3rdParty_sources/gson/com/google/gson/FieldNamingStrategy.java
    • -0
    • +905
    /3rdParty_sources/gson/com/google/gson/Gson.java
    • -0
    • +566
    /3rdParty_sources/gson/com/google/gson/GsonBuilder.java
    • -0
    • +92
    /3rdParty_sources/gson/com/google/gson/InstanceCreator.java
    • -0
    • +291
    /3rdParty_sources/gson/com/google/gson/JsonArray.java
    • -0
    • +44
    /3rdParty_sources/gson/com/google/gson/JsonDeserializationContext.java
    • -0
    • +91
    /3rdParty_sources/gson/com/google/gson/JsonDeserializer.java
    • -0
    • +330
    /3rdParty_sources/gson/com/google/gson/JsonElement.java
    • -0
    • +45
    /3rdParty_sources/gson/com/google/gson/JsonIOException.java
    • -0
    • +63
    /3rdParty_sources/gson/com/google/gson/JsonNull.java
    • -0
    • +195
    /3rdParty_sources/gson/com/google/gson/JsonObject.java
  16. … 210 more files in changeset.
Friday 22 Nov 2013
1:06 am

Andrey Balan

LDEV-3144 Show *all* rows instead of only 20 first ones as by default

Options
    • -4
    • +1
    /lams_gradebook/web/gradebookCourseMonitor.jsp
12:12 am

Andrey Balan

LDEV-3152 use simple filename to prevent exception throwing

Options
    • -34
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Thursday 21 Nov 2013
12:33 am

Marcin Cieslak

LDEV-3115: Fill "input" dropdown in branching properties. Load branching grouping from stored LD. Add "Match Groups to Branches" dialog.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +38
    /lams_central/web/author2.jsp
    • -1
    • +47
    /lams_central/web/css/authoring.css
    • -300
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -121
    • +40
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -2
    • +40
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -0
    • +554
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
Wednesday 20 Nov 2013
12:56 am

Marcin Cieslak

LDEV-3115: Allow branching in the same row when rearranging activities, if it is not too long. Add partial branching properties dialog. Add "transition" button. Several bug fixes and adjustments.

Options
    • -11
    • +63
    /lams_central/web/author2.jsp
    • -1
    • +6
    /lams_central/web/css/authoring.css
    • -56
    • +168
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -35
    • +18
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -13
    • +8
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
    • -23
    • +54
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
Tuesday 19 Nov 2013
3:45 am

Andrey Balan

LDEV-3151 Display max mark correctly both for question and total

Options
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20131118.sql
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -9
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -29
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +53
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
1:57 am

Marcin Cieslak

LDEV-3115: Layout adjustments for Chrome and IE. Enable jQuery draggable on iPad.

Options
    • -0
    • +1
    /lams_central/web/author2.jsp
    • -5
    • +5
    /lams_central/web/css/authoring.css
    • -4
    • +12
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
    • -1
    • +2
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -0
    • +11
    /lams_central/web/includes/javascript/jquery.ui.touch-punch.js
Friday 15 Nov 2013
11:58 pm

Marcin Cieslak

LDEV-3115: Add more properties for Grouping activities. Make them show/hide/change when needed. Set properties correctly when loading LDs. Fix arranging activities on canvas when loading complex branching activities.

Options
    • -3
    • +64
    /lams_central/web/author2.jsp
    • -2
    • +14
    /lams_central/web/css/authoring.css
    • -24
    • +137
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -47
    • +149
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js