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 16 Aug 2019
10:07 pm

Marcin Cieslak

Merge branch 'LDEV-4848' into LDEV-4745

Options
10:07 pm

Marcin Cieslak

LDEV-4848 Internationalise labels in Question Bank

Options
    • -0
    • +67
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -28
    • +32
    /lams_central/web/qb/collection.jsp
    • -11
    • +12
    /lams_central/web/qb/collectionList.jsp
    • -44
    • +49
    /lams_central/web/qb/stats.jsp
8:26 pm

Marcin Cieslak

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Options
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +1
    /lams_central/web/qb/stats.jsp
8:23 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4844

Options
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +65
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -6
    • +204
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -0
    • +24
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
8:20 pm

Marcin Cieslak

LDEV-4827, LDEV-4844 Toggle question merging is admin panel

Options
    • -655
    • +656
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190816.sql
    • -305
    • +306
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
7:33 pm

Marcin Cieslak

LDEV-4745 Set tool content ID in MCQ questions when importing a LD

Options
    • -24
    • +24
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java
1:01 am

Marcin Cieslak

Merge branch 'LDEV-4846' into LDEV-4745

Options
12:52 am

Marcin Cieslak

LDEV-4846 Export/import QB questions' content folders

Options
    • -43
    • +74
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -0
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +20
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -0
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Thursday 15 Aug 2019
11:48 pm

Marcin Cieslak

LDEV-4846 Set LD's content folder ID when importing old questions

In pre-QB LAMS version only LD had content folder ID. In QB each

question has its own content folder ID. When importing pre-QB questions

and converting them into QB questions, we give them the LD's (shared)

content folder ID.

Options
    • -3
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -19
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -19
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -20
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
8:53 pm

Marcin Cieslak

LDEV-4847 Do not export question IDs, versions etc. when exporting a LD

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:31 pm

Marcin Cieslak

LDEV-4847 Look for existing QB question UUIDs when importing a LD

Options
    • -4
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -2
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +9
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -3
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +42
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -35
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -15
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -15
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -3
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +42
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -35
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -15
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -15
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
7:10 pm

Marcin Cieslak

LDEv-4845 Add imported QB questions to public collection

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
7:06 pm

Marcin Cieslak

LDEv-4845 Add default create date to imported QB question

Some old exported LDs do not have create dates for Assessment questions.

Options
    • -1
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
6:58 pm

Marcin Cieslak

LDEv-4845 Do not remove fields which were removed by previous filters

Options
    • -7
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -1
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
Wednesday 14 Aug 2019
1:22 pm

Marcin Cieslak

LDEv-4845 Use LD's content folder ID for new QB questions.

Also minor bug fixes.

Options
    • -8
    • +30
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -18
    • +26
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -4
    • +26
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -4
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
6:01 am

Marcin Cieslak

LDEv-4845 LD XML transformation for remaining Assessment question types

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +46
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -1
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -5
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
Tuesday 13 Aug 2019
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
4:59 am

Andrey Balan

Merge branch 'LDEV-4850' into develop

Options
4:28 am

Andrey Balan

LDEV-4850 Adjust LTI integration to support course copy

Options
    • -19
    • +47
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
4:28 am

Andrey Balan

LDEV-4850 Adjust LTI integration to support course copy

Options
    • -20
    • +49
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
3:42 am

Marcin Cieslak

LDEv-4845 LD XML transformation for Assessment MC questions

Options
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
    • -6
    • +140
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -9
    • +30
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
2:16 am

Marcin Cieslak

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

Options
    • -5
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
2:15 am

Marcin Cieslak

Merge branch 'LDEV-4851'

Options
2:15 am

Marcin Cieslak

LDEV-4851 Add email to Learner and LearnerOutput elements

Options
    • -5
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
Monday 12 Aug 2019
4:07 am

Marcin Cieslak

LDEv-4845LD LD XML transformation for Scratchie tool

Options
    • -25
    • +65
    /lams_common/src/java/org/lamsfoundation/lams/util/XMLUtil.java
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -0
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -2
    • +81
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -0
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
4:07 am

Marcin Cieslak

LDEv-4845 Minor fix when iterating on imported options

Options
    • -7
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
2:05 am

Marcin Cieslak

LDEv-4845 Correctly fill missing options display order

Options
    • -1
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java