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
Monday 10 Aug 2015
11:24 pm

Marcin Cieslak

LDEV-3514: Use pretInterceptor instead of postInterceptor. Create new transactions for service method retries.

Attach activity to Hibernate session in completeActivity() method.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
    • -11
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java
    • -13
    • +44
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -5
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  16. … 28 more files in changeset.
11:08 pm

Marcin Cieslak

LDEV-3514: Use pretInterceptor instead of postInterceptor. Create new transactions for service method retries.

Attach activity to Hibernate session in completeActivity() method.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
    • -11
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java
    • -13
    • +44
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -5
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  16. … 29 more files in changeset.
10:13 pm

Marcin Cieslak

LDEV-3530: Make the check for existing user a part of user creation transaction, so transaction retries are working on the latest data.

Options
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -81
    • +86
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -77
    • +83
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
10:07 pm

Marcin Cieslak

LDEV-3530: Make the check for existing user a part of user creation transaction, so transaction retries are working on the latest data.

Options
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -81
    • +86
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -77
    • +83
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
12:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3510 Setting a position in the Blackboard content object allows the LAMS content to be moved in the list.

Options
    • -0
    • +4
    /lams_bb_integration/web/modules/learnermonitor.jsp
    • -1
    • +2
    /lams_bb_integration/web/modules/modify.jsp
12:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3510 Setting a position in the Blackboard content object allows the LAMS content to be moved in the list.

Options
    • -0
    • +4
    /lams_bb_integration/web/modules/learnermonitor.jsp
    • -1
    • +2
    /lams_bb_integration/web/modules/modify.jsp
12:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3484: Implementing StartLesson as a servlet, with a JSON response.

Options
    • -0
    • +10
    /lams_bb_integration/WEB-INF/web.xml
    • -0
    • +247
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonServlet.java
12:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3484: Implementing StartLesson as a servlet, with a JSON response.

Options
    • -0
    • +10
    /lams_bb_integration/WEB-INF/web.xml
    • -0
    • +247
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/StartLessonServlet.java
Sunday 09 Aug 2015
12:57 am

Marcin Cieslak

LDEV-3528: Use different trigger for word counting as "keyup" event does not always reach CKEditor.

Options
    • -5
    • +2
    /lams_tool_assessment/web/pages/learning/parts/essay.jsp
12:56 am

Marcin Cieslak

LDEV-3528: Use different trigger for word counting as "keyup" event does not always reach CKEditor.

Options
    • -5
    • +2
    /lams_tool_assessment/web/pages/learning/parts/essay.jsp
12:42 am

Marcin Cieslak

LDEV-3527: Scroll to the same place after loading refreshed content.

Options
    • -1
    • +5
    /lams_tool_scratchie/web/pages/learning/learning.jsp
12:40 am

Marcin Cieslak

LDEV-3527: Scroll to the same place after loading refreshed content.

Options
    • -1
    • +5
    /lams_tool_scratchie/web/pages/learning/learning.jsp
Friday 07 Aug 2015
1:28 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3523: Removing debugging left in accidently.

Options
    • -2
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
1:18 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3523: Added subtype to Learning Design

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -14
    • +24
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -11
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -0
    • +7
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040043.sql
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
11:54 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3523: Added subtype to Learning Design

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -14
    • +24
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -11
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -0
    • +7
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040043.sql
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
11:24 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3523: Added subtype to Learning Design LDEV-3526: Switched webservice calls to POST.

Options
    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
    • -1
    • +2
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsLearningDesignServlet.java
    • -9
    • +67
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
11:24 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3523: Added subtype to Learning Design LDEV-3526: Switched webservice calls to POST.

Options
    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -1
    • +1
    /lams_bb_integration/build.xml
    • -1
    • +2
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsLearningDesignServlet.java
    • -9
    • +67
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
Thursday 06 Aug 2015
1:46 am

Marcin Cieslak

LDEV-3525: Add the user to the course even if he/she is already authenticated and we just redirect him/her.

Options
    • -6
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
1:45 am

Marcin Cieslak

LDEV-3525: Add the user to the course even if he/she is already authenticated and we just redirect him/her.

Options
    • -13
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
1:45 am

Marcin Cieslak

LDEV-3514: Use postInterceptor instead of preInterceptor. PreInterceptor apparently runs before Hibernate transaction gets created. When an exception in the proxied method occurs, the transaction is canceled and is not re-created when retry is attempted. This leads to "no session" or "read only transaction on write" errors. PostInterceptor seems to work when the transaction is already created, so retries happen witin its scope.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -1
    • +5
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +1
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
    • -1
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
  16. … 25 more files in changeset.
12:49 am

Marcin Cieslak

LDEV-3514: Use postInterceptor instead of preInterceptor. PreInterceptor apparently runs before Hibernate transaction gets created. When an exception in the proxied method occurs, the transaction is canceled and is not re-created when retry is attempted. This leads to "no session" or "read only transaction on write" errors. PostInterceptor seems to work when the transaction is already created, so retries happen witin its scope.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -6
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -1
    • +5
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +1
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
    • -1
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
  16. … 25 more files in changeset.
Wednesday 05 Aug 2015
5:04 am

Marcin Cieslak

LDEV-3525: Check if user re-authenticates with the same role.

Options
    • -1
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
4:56 am

Marcin Cieslak

LDEV-3525: Check if user re-authenticates with the same role.

Options
    • -4
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
Tuesday 04 Aug 2015
3:45 am

Marcin Cieslak

LDEV-3524: If min > max, set max to min.

Options
    • -8
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
3:44 am

Marcin Cieslak

LDEV-3524: If min > max, set max to min.

Options
    • -8
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
Monday 03 Aug 2015
6:16 pm

Marcin Cieslak

LDEV-3490: Fix activity title wrap in progress bar.

Options
    • -32
    • +31
    /lams_central/web/includes/javascript/progressBar.js
6:15 pm

Marcin Cieslak

LDEV-3490: Fix activity title wrap in progress bar.

Options
    • -32
    • +31
    /lams_central/web/includes/javascript/progressBar.js
Friday 31 Jul 2015
4:05 pm

Andrey Balan

LDEV-3522 Make adding justification textareas optional

Options
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -6
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -0
    • +7
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -5
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -13
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
4:01 pm

Andrey Balan

LDEV-3522 Make adding justification textareas optional

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -6
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +7
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -5
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -13
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
3:16 pm

Andrey Balan

LDEV-3509 *Store blank burning questions. In this way other groups will see these empty burning questions. Besides, non-leaders will be able to move on once leader submits empty burning questions (and not after he's finished the activity) *Fixed Students stuck in Scratchie when leader submits empty burning questions

Options
    • -7
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java