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 02 Aug 2020
8:22 pm

Marcin Cieslak

LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

Options
    • -21
    • +132
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -0
    • +8
    /lams_central/web/WEB-INF/web.xml
    • -0
    • +11
    /lams_central/web/css/uppy.min.css
    • -0
    • +2
    /lams_central/web/includes/javascript/uppy.min.js
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -13
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
    • -11
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
    • -2
    • +1
    /lams_tool_images/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
    • -9
    • +8
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -106
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java
    • -128
    • +76
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java
    • -74
    • +11
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
    • -0
    • +9
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java
    • -104
    • +70
    /lams_tool_images/web/includes/javascript/imageGalleryitem.js
  16. … 4 more files in changeset.
10:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -38
    • +38
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -102
    • +0
    /lams_learning/conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -47
    • +0
    /lams_tool_forum/conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -9
    • +14
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
  16. … 7 more files in changeset.
Saturday 01 Aug 2020
6:43 pm

Ernie Ghiglione

LDEV-4769 Fixing incorrect import for Wiki

Sorry my bad.

Options
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties
    • -103
    • +137
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -104
    • +138
    /lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties
    • -101
    • +126
    /lams_tool_wiki/conf/language/lams/ApplicationResources_fr_FR.properties
    • -105
    • +139
    /lams_tool_wiki/conf/language/lams/ApplicationResources_no_NO.properties
Thursday 30 Jul 2020
12:36 pm

Marcin Cieslak

Merge branch 'LDEV-5058' into v4.0

Options
12:35 pm

Marcin Cieslak

LDEV-5058 Move activity category from DB to authoring front end

Options
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -30
    • +20
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +0
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +0
    /lams_central/web/authoring/svgGenerator.jsp
    • -0
    • +47
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -8
    • +16
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -9
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -12
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
    • -2
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
Wednesday 29 Jul 2020
11:22 am

Ernie Ghiglione

LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

Options
    • -16
    • +16
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +22
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +14
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +69
    /lams_tool_zoom/conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 28 Jul 2020
7:48 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish to proper UTF-8 encoding

Options
    • -20
    • +20
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
7:47 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish for Zoom tool

Options
    • -74
    • +67
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +69
    /lams_tool_zoom/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +55
    /lams_tool_zoom/conf/language/lams/ApplicationResources_es_ES.properties
7:30 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

Options
    • -682
    • +659
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -667
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -666
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -668
    • +657
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -500
    • +419
    /lams_admin/conf/language/lams/ApplicationResources_fr_FR.properties
    • -668
    • +659
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -1089
    • +1062
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1066
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -328
    • +316
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -327
    • +316
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -327
    • +316
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
  16. … 157 more files in changeset.
3:09 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -2
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -0
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
3:06 pm

Marcin Cieslak

Merge branch 'LDEV-5057'

Options
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/messageContext.xml
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
    • -0
    • +1
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
    • -0
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
  16. … 19 more files in changeset.
Monday 27 Jul 2020
2:59 pm

Marcin Cieslak

LDEV-4233 Fix user count in paging when current user is not displayed

Options
    • -2
    • +3
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -87
    • +82
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -16
    • +18
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
2:44 pm

Marcin Cieslak

LDEV-4109 Fix paging with comment criteria in Peer Review

Options
    • -6
    • +6
    /lams_tool_preview/web/pages/learning/comment.jsp
Thursday 23 Jul 2020
2:26 pm

Marcin Cieslak

LDEV-3716 Allow checking Assessment mcq options when clicking on label

Options
    • -3
    • +6
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
2:11 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Assessment

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -5
    • +8
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
12:19 am

Marcin Cieslak

LDEV-5055 Make colour of correct option change progressively

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/qb-option.js
Wednesday 22 Jul 2020
10:41 pm

Marcin Cieslak

LDEV-5055 Use letters instead of numbers for all question types

Options
    • -2
    • +1
    /lams_central/web/includes/javascript/qb-option.js
    • -3
    • +2
    /lams_central/web/qb/authoring/optionlist.jsp
5:02 pm

Marcin Cieslak

Merge branch 'LDEV-5055' into v4.0

Options
5:01 pm

Marcin Cieslak

LDEV-5055 Colour display order circle for a correct option

Options
    • -1
    • +6
    /lams_central/web/css/qb-question.scss
    • -0
    • +8
    /lams_central/web/includes/javascript/qb-option.js
    • -2
    • +3
    /lams_central/web/qb/authoring/optionlist.jsp
4:45 pm

Marcin Cieslak

LDEV-5055 Use letters instead of numbers for options in authoring

Options
    • -0
    • +1
    /lams_central/web/includes/javascript/qb-option.js
    • -1
    • +5
    /lams_central/web/qb/authoring/optionlist.jsp
4:19 pm

Marcin Cieslak

LDEV-5055 Do not set auto title nor aria-label attributes to CKEditor

Options
    • -1
    • +3
    /lams_central/web/ckeditor/ckeditor.js
Monday 20 Jul 2020
3:51 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
3:51 pm

Marcin Cieslak

LDEV-5031 Do not auto refresh AEs Student Choices tab

Options
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
3:17 pm

Marcin Cieslak

Merge branch 'LDEV-5035' into v4.0

Options
2:33 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
2:32 pm

Marcin Cieslak

LDEV-5031 Do not auto refresh AEs and Burning Questions tabs

Options
    • -2
    • +9
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
Friday 17 Jul 2020
8:37 pm

Marcin Cieslak

LDEV-5015 Temporarily revert to MCQ as IRA for TBL template

Options
    • -7
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
6:01 pm

Marcin Cieslak

Merge branch 'LDEV-5053' into v4.0

Options
6:01 pm

Marcin Cieslak

LDEV-5053 Fix Learning Outcome mapping encoding

Options
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java