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 05 Dec 2019
7:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -1
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +1
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -2
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +35
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -0
    • +5
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
Wednesday 04 Dec 2019
9:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -4
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -3
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -1
    • +1
    /lams_central/web/qb/collection.jsp
    • -0
    • +18
    /lams_central/web/questions/questionChoice.jsp
    • -0
    • +1
    /lams_central/web/questions/questionFile.jsp
    • -2
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +35
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -3
    • +0
    /lams_tool_lamc/web/authoring/itemlist.jsp
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -7
    • +17
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +16
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +19
    /lams_central/web/includes/javascript/main.js
    • -1
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_chat/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_daco/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
  16. … 21 more files in changeset.
2:20 am

Andrey Balan

Merge branch 'LDEV-4918'

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +29
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +51
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/CollapseOrganisationController.java
    • -0
    • +6
    /lams_central/web/css/_main_base.scss
    • -3
    • +40
    /lams_central/web/group.jsp
    • -0
    • +19
    /lams_central/web/includes/javascript/main.js
    • -0
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20191202.sql
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/index/IndexOrgBean.java
    • -0
    • +71
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.java
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -1
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -1
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -7
    • +16
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +16
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +81
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +252
    /lams_common/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +13
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +13
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
    • -8
    • +9
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +11
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
  16. … 108 more files in changeset.
2:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Adding ides to test monitor starting new lesson

Options
    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
    • -1
    • +1
    /lams_monitoring/web/grouping/chosenGrouping.jsp
    • -2
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -1
    • +1
    /lams_tool_lamc/web/authoring/editQuestionBox.jsp
    • -2
    • +2
    /lams_tool_lamc/web/authoring/itemlist.jsp
6:24 am

Ernie Ghiglione

LDEV-4769 updating labels

Greek and Norwegian

Options
    • -2
    • +8
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
Saturday 30 Nov 2019
1:42 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
6:49 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources_no_NO.properties

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java

Options
    • -25
    • +161
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +5
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -14
    • +7
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
6:38 am

Andrey Balan

Merge branch 'LDEV-4913'

Options
6:37 am

Andrey Balan

LDEV-4913 Include a minimum number of files to submit

* Improve learner jsp layout

Options
    • -3
    • +5
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +6
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
    • -0
    • +14
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20191128.sql
    • -201
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java
    • -10
    • +0
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java
    • -0
    • +12
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/model/SubmitFilesContent.java
    • -0
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -1
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java
    • -10
    • +7
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
    • -9
    • +7
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
    • -0
    • +11
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java
    • -56
    • +120
    /lams_tool_sbmt/web/authoring/advance.jsp
    • -3
    • +3
    /lams_tool_sbmt/web/authoring/authoring.jsp
    • -213
    • +199
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
    • -2
    • +2
    /lams_tool_sbmt/web/monitoring/parts/activity.jsp
    • -0
    • +138
    /lams_tool_sbmt/web/monitoring/parts/advanceoptions.jsp
    • -135
    • +5
    /lams_tool_sbmt/web/monitoring/parts/summary.jsp
Friday 29 Nov 2019
10:15 pm

Marcin Cieslak

LKC-228 Fix QTI import when question has multiple images

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
Thursday 28 Nov 2019
7:29 pm

Marcin Cieslak

Merge branch 'master' into LDEV-4915

Options
7:28 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -12
    • +20
    /lams_central/web/includes/javascript/addLesson.js
    • -13
    • +20
    /lams_monitoring/web/includes/javascript/monitorLesson.js
6:53 pm

Marcin Cieslak

Merge branch 'LDEV-4916'

Options
6:53 pm

Marcin Cieslak

LDEV-4916 Fix resizing images saved in CMYK/ICC/unsupported color space

Options
    • -35
    • +40
    /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
    • -3
    • +8
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
4:27 pm

Marcin Cieslak

LDEV-4916 Add meaningful errors image gallery upload errors

Options
    • -3
    • +4
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -6
    • +6
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
Wednesday 27 Nov 2019
4:26 pm

Marcin Cieslak

LDEV-4916 Static fields can not be autowired

Spring does not support it.

Options
    • -9
    • +3
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java
    • -8
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -2
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java
    • -3
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
    • -12
    • +13
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
Tuesday 26 Nov 2019
10:29 pm

Andrey Balan

LDEV-4860 Grey out labels for disabled checkboxes

Options
    • -2
    • +4
    /lams_tool_assessment/web/pages/authoring/advance.jsp
10:26 pm

Andrey Balan

LDEV-4860 Fix matching pairs excel export

Options
    • -3
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
10:04 am

Ernie Ghiglione

LDEV-4769 Updating labels

Updating Norwegian

Options
    • -26
    • +158
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
1:34 am

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +21
    /lams_central/web/qb/search.jsp
    • -5
    • +24
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +24
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +25
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -0
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Monday 25 Nov 2019
11:11 pm

Marcin Cieslak

LDEV-4915 Reopen Hibernate session. Add logs.

Hibernate session should be open for an inner transaction created by

retry() method of TransactionRetryService. It does not seem to work this

way anymore, so we need to reopen it manually.

Options
    • -0
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
7:02 pm

Andrey Balan

LDEV-4908 When exporting VSAs in QTI, all options should be exported

Options
    • -32
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
6:10 pm

Marcin Cieslak

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

Options
    • -94
    • +86
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:09 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

Options
    • -10
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
6:06 pm

Marcin Cieslak

LDEV-3514 Make logs better for transaction retry mechanism

Options
    • -9
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
2:45 pm

Marcin Cieslak

LDEV-4771 Re-introduce multiple activity authoring dialogs

Options
    • -1
    • +1
    /lams_central/web/authoringConfirm.jsp
    • -7
    • +6
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
7:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options