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
Sunday 27 Jan 2019
6:10 pm

Marcin Cieslak

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

Options
6:09 pm

Marcin Cieslak

LDEV-4696 Reintroduce a failsafe for missing branch activities set

There are normal situations where the collection is null. It needs to be

checked before attempting to add something.

Options
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

Options
    • -1
    • +4
    /lams_admin/web/WEB-INF/tags/Head.tag
    • -38
    • +30
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_build/common.properties
    • -45
    • +48
    /lams_central/conf/scss/_lams_variables.scss
    • -118
    • +2
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -114
    • +119
    /lams_central/conf/scss/_mixins.scss
    • -0
    • +66
    /lams_central/conf/scss/material-kit.scss
    • -0
    • +53
    /lams_central/conf/scss/material-kit/_alerts.scss
    • -0
    • +43
    /lams_central/conf/scss/material-kit/_badges.scss
    • -0
    • +228
    /lams_central/conf/scss/material-kit/_buttons.scss
    • -0
    • +327
    /lams_central/conf/scss/material-kit/_cards.scss
    • -0
    • +95
    /lams_central/conf/scss/material-kit/_carousel.scss
    • -0
    • +201
    /lams_central/conf/scss/material-kit/_checkboxes.scss
    • -0
    • +66
    /lams_central/conf/scss/material-kit/_core-bootstrap.scss
    • -0
    • +10
    /lams_central/conf/scss/material-kit/_custom-forms.scss
  16. … 249 more files in changeset.
Saturday 26 Jan 2019
2:35 pm

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +1
    /lams_central/web/css/_progressBar_base.scss
    • -1
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -18
    • +39
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190126.sql
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -14
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
  16. … 9 more files in changeset.
2:07 am

Andrey Balan

LDEV-4765 introducing new question authoring UI

Options
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/LICENSE
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/confighelper/README.md
    • -0
    • +128
    /lams_central/web/ckeditor/plugins/confighelper/docs/install.html
    • -0
    • +59
    /lams_central/web/ckeditor/plugins/confighelper/docs/styles.css
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -1
    • +8
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -0
    • +11
    /lams_central/web/includes/javascript/jquery-ui.touch-punch.js
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -68
    • +349
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -4
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
2:07 am

Andrey Balan

QB_UI introducing new question authoring UI

Options
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/LICENSE
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/confighelper/README.md
    • -0
    • +128
    /lams_central/web/ckeditor/plugins/confighelper/docs/install.html
    • -0
    • +59
    /lams_central/web/ckeditor/plugins/confighelper/docs/styles.css
    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -1
    • +8
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -0
    • +11
    /lams_central/web/includes/javascript/jquery-ui.touch-punch.js
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    /lams_tool_assessment/web/includes/javascript/assessmentoption.js
    • -68
    • +350
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/option.jsp
    • -4
    • +30
    /lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
Friday 25 Jan 2019
2:47 pm

Marcin Cieslak

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

Options
2:46 pm

Marcin Cieslak

LDEV-4721 Fix version filter method names

Options
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesImportContentVersionFilter.java
    • -1
    • +1
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java
Thursday 24 Jan 2019
10:16 pm

Marcin Cieslak

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

Options
10:15 pm

Marcin Cieslak

Merge branch 'LDEV-4757'

Options
10:13 pm

Marcin Cieslak

LDEV-4757 Fix group overwriting with same UIID

Groups' UIIDs were not taken into account when calculating max UIID for

opened LD. Sometimes an existing UIID got generated and it overwrote an

existing group.

Also adjust new group naming.

Options
    • -0
    • +4
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
6:44 pm

Marcin Cieslak

LDEV-4746 Introduce QB service and DAO

Options
    • -1
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -9
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -16
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -2
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
6:21 pm

Marcin Cieslak

LDEV-4746 Move QB entities to another package

Options
    • -110
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java
    • -187
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java
    • -50
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbToolQuestion.java
    • -0
    • +110
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java
    • -0
    • +187
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +50
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
  16. … 5 more files in changeset.
5:32 pm

Marcin Cieslak

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

Options
5:30 pm

Marcin Cieslak

Merge branch 'LDEV-4758'

Options
5:29 pm

Marcin Cieslak

LDEV-4758 In CKEditor plugin use JS code which is IE11 compliant

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/image2/dialogs/image2.js
5:05 pm

Marcin Cieslak

LDEV-4746 Improve SQL migration script

When looking for unique questions to be put into Question Bank, it takes

into account its options too.

Options
    • -22
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Wednesday 23 Jan 2019
10:08 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4746

Options
10:07 pm

Marcin Cieslak

LDEV-4746 Use QB option directly instead of MCQ option

Keeping a reference from MCQ option to QB option proved unnecessary and

problematic. It is sufficient for QB question to keep this reference.

Options
    • -5
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -7
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java
    • -12
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java
    • -13
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
    • -29
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -24
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -22
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -114
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -49
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -33
    • +23
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -6
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -21
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
    • -54
    • +61
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
  16. … 11 more files in changeset.
6:02 pm

Marcin Cieslak

LDEV-4746 Change search algorithm when migrating from tool to QB

Now all QB questions with matching type are taken into account, not just

ones just migrated from a tool.

Options
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
5:59 pm

Marcin Cieslak

LDEV-4746 Introduce a super class for tool questions

Options
    • -18
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +50
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbToolQuestion.java
    • -32
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
4:03 pm

Marcin Cieslak

LDEV-4746 Move display order from MCQ option to QB option

Options
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -5
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
    • -22
    • +10
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -3
    • +13
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -3
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
12:26 am

Marcin Cieslak

LDEV-4746 Allow adding new QB questions to MCQ

Add some comments.

Options
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java
    • -9
    • +20
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
12:08 am

Marcin Cieslak

LDEV-4746 Redesign flow for saving MCQ questions

Detached QB entities act as their own DTOs.

Question options modification is detected and processed.

Options
    • -1
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbOption.java
    • -20
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbQuestion.java
    • -1
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +9
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McOptsContent.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -22
    • +55
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -1
    • +1
    /lams_tool_lamc/web/authoring/candidateAnswersList.jsp
12:07 am

Marcin Cieslak

LDEV-4746 Fix a typo in SQL patch

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Monday 21 Jan 2019
6:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4756 Can add attachments to Forum messages.

Options
    • -0
    • +14
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20190121.sql
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
6:22 pm

Marcin Cieslak

Merge branch 'LDEV-4755' into develop

Options
4:08 pm

Marcin Cieslak

LDEV-4755 Scan when importing LDs

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java
    • -0
    • +5
    /lams_central/web/toolcontent/import.jsp
    • -10
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
3:34 pm

Marcin Cieslak

LDEV-4755 Display upload errors nicer

Options
    • -20
    • +24
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -4
    • +12
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
1:37 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4756' Attachments can be added to Forum

Options