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 12 Aug 2019
1:24 am

Marcin Cieslak

LDEv-4845 Remove pre-QB code preventing Scratchie export

Options
    • -11
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
1:08 am

Marcin Cieslak

LDEv-4845 Clean up obsolete MCQ XML elements after transformation

Options
    • -2
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/util/XMLUtil.java
    • -6
    • +7
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
Friday 09 Aug 2019
10:01 pm

Marcin Cieslak

LDEv-4845 Initial LD XML transformation for MCQ tool.

Options
    • -2
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +42
    /lams_common/src/java/org/lamsfoundation/lams/util/XMLUtil.java
    • -0
    • +15
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190809.sql
    • -1
    • +79
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -1
    • +21
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
7:06 pm

Marcin Cieslak

LDEv-4845 Allow XML transformation version filter methods

Such methods can do whatever they need to with tool XML file. After

that, standard way of applying version filters carries on.

Options
    • -9
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -4
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
7:03 pm

Andrey Balan

Merge branch 'LDEV-4589-develop' into develop

Options
7:02 pm

Andrey Balan

LDEV-4589 Add comments, remove logs

Options
    • -6
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -161
    • +62
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
7:02 pm

Andrey Balan

LDEV-4589 Add comments, remove logs

Options
    • -6
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -161
    • +62
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
5:03 am

Andrey Balan

LDEV-4589 Fix content-item feature

Options
    • -155
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
5:03 am

Andrey Balan

LDEV-4589 Fix content-item feature

Options
    • -153
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Thursday 08 Aug 2019
10:29 pm

Marcin Cieslak

LDEv-4844 Add an event in audit log when QB questions get merged

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190808.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
10:07 pm

Marcin Cieslak

LDEv-4844 Fix answer merging for Assessment questions

Options
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
Wednesday 07 Aug 2019
9:32 pm

Andrey Balan

LDEV-4589 Make org.apache.httpcomponents.core module available

Options
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
9:32 pm

Andrey Balan

LDEV-4589 Make org.apache.httpcomponents.core module available

Options
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
6:36 pm

Andrey Balan

Merge branch 'LDEV-4589-membership' into LDEV-4589-develop

Options
3:20 pm

Marcin Cieslak

LDEv-4844 Allow manual QB question merging

Options
    • -0
    • +37
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -4
    • +69
    /lams_central/web/qb/stats.jsp
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -3
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:47 am

Andrey Balan

LDEV-4589 Add support for LTI membership service

Includes interim logging.

Options
    • -0
    • +2
    /lams_build/build_base.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -3
    • +159
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -43
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +2
    /lams_common/.classpath
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190806.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
    • -1
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +259
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
4:47 am

Andrey Balan

LDEV-4589 Add support for LTI membership service

Includes interim logging.

Options
    • -0
    • +2
    /lams_build/build_base.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -4
    • +161
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -43
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +2
    /lams_common/.classpath
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190806.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
    • -1
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +259
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
Monday 05 Aug 2019
9:14 pm

Marcin Cieslak

LDEV-4746 Delete corrupted Assessment results before migration

Options
    • -11
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
1:43 pm

Marcin Cieslak

LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

Options
    • -6
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -4
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -35
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -26
    • +27
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -20
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/essay.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/results/historyresponses.jsp
  16. … 9 more files in changeset.
Sunday 04 Aug 2019
9:48 pm

Marcin Cieslak

LDEV-4841 Initial Q&A tool back end migration to Question Bank

Options
    • -5
    • +104
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -55
    • +76
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -18
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -31
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -3
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java
    • -8
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java
    • -4
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java
    • -11
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java
    • -12
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaCondition.java
    • -169
    • +16
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -133
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -7
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
  16. … 6 more files in changeset.
5:10 am

Andrey Balan

LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

Options
    • -4
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -2
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -5
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -14
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -4
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -34
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -173
    • +125
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -97
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -0
    • +2
    /lams_tool_scratchie/web/pages/authoring/authoring.jsp
    • -25
    • +28
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -41
    • +58
    /lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
    • -14
    • +21
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
    • -14
    • +19
    /lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/authoring/start.jsp
5:07 am

Andrey Balan

LDEV-4838 Move collection processing to common utils method

Options
    • -55
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addessay.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addordering.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -2
    • +2
    /lams_central/web/qb/collection.jsp
    • -0
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -26
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
5:02 am

Andrey Balan

LDEV-4836 Fix restricted authoring page

Options
    • -6
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
Wednesday 31 Jul 2019
8:49 pm

Andrey Balan

LDEV-4745 Fix exception on importing QTI questions and XML ones

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -6
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
4:31 am

Andrey Balan

LDEV-4836 Add questions drag and drop feature

Options
    • -3
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -123
    • +69
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -64
    • +41
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -18
    • +50
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
Tuesday 30 Jul 2019
3:35 am

Andrey Balan

LDEV-4745 Add uuid to QbQuestion

* reintroduce fill content_folder_id command

Options
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
1:07 am

Marcin Cieslak

LDEV-4782 Fix question stats calculation

Options
    • -13
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -4
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Saturday 27 Jul 2019
5:47 am

Andrey Balan

LDEV-4836 Update edit in monitor feature after migration to QB

Options
    • -23
    • +50
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -13
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
4:40 am

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -13
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
4:14 am

Marcin Cieslak

LDEV-4746 Fix migration script for Talca issues

Options
    • -433
    • +444
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql