lams-github

lams_common

Clone Tools

Stats

Commits this week: 0
Total Committers: 37
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 20 Aug 2020
2:46 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -1
    • +1
    ./db/sql/create_lams_11_tables.sql
    • -10
    • +53
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200219_updateTo40.sql
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +17
    ./src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  5. … 22 more files in changeset.
Wednesday 12 Aug 2020
7:52 pm

Marcin Cieslak

LDEV-4746 Assign migrated QB questions to their owners' collections

Options
    • -14
    • +38
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -4
    • +21
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
Monday 10 Aug 2020
12:49 pm

Marcin Cieslak

LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

Options
    • -1
    • +1
    ./db/sql/create_lams_11_tables.sql
  2. … 41 more files in changeset.
Friday 07 Aug 2020
12:52 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -7
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 45 more files in changeset.
Tuesday 04 Aug 2020
4:30 pm

Marcin Cieslak

LDEV-4917 Clean up tmp uploaded files when they are no longer needed

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/util/FileUtil.java
  2. … 3 more files in changeset.
Monday 03 Aug 2020
2:23 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -9
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 22 more files in changeset.
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
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -13
    • +2
    ./src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java
    • -11
    • +2
    ./src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
  4. … 16 more files in changeset.
10:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 20 more files in changeset.
Thursday 30 Jul 2020
12:35 pm

Marcin Cieslak

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

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql
    • -38
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -18
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -12
    • +2
    ./src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
  9. … 7 more files in changeset.
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
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 11 more files in changeset.
Tuesday 28 Jul 2020
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
    • -328
    • +316
    ./conf/language/lams/ApplicationResources.properties
    • -327
    • +316
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -327
    • +316
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -327
    • +316
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -64
    • +307
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -327
    • +316
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 166 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
    ./src/java/org/lamsfoundation/lams/commonContext.xml
  2. … 5 more files in changeset.
3:04 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/messageContext.xml
  3. … 32 more files in changeset.
Friday 10 Jul 2020
10:45 pm

Marcin Cieslak

LDEV-4847 Fix importing QB question with existing UUID

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -2
    • +17
    ./src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/qb/service/QbService.java
  5. … 4 more files in changeset.
4:52 pm

Marcin Cieslak

LDEV-5050 Move "is required" attribute from QB question to tools

Options
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200710.sql
    • -15
    • +6
    ./src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
  5. … 26 more files in changeset.
Tuesday 07 Jul 2020
8:50 pm

Marcin Cieslak

LKC-222 Simplify authorization flow for Workflow Automation

Learners need to already exist in the organisation. Staff gets synced

and added.

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/integration/util/IntegrationConstants.java
  3. … 1 more file in changeset.
Monday 06 Jul 2020
6:52 pm

Marcin Cieslak

LKC-222 Add course and lesson roles to user on WA access

Options
    • -7
    • +5
    ./src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
    • -24
    • +27
    ./src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -43
    • +41
    ./src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/integration/util/IntegrationConstants.java
  5. … 1 more file in changeset.
Friday 26 Jun 2020
8:23 pm

Marcin Cieslak

LDEV-5047 Make numeric option more accurate as it performs rounding

Options
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200626.sql
  2. … 1 more file in changeset.
Monday 22 Jun 2020
4:48 pm

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -12
    • +6
    ./src/java/org/lamsfoundation/lams/events/EventNotificationService.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -19
    • +26
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
  4. … 3 more files in changeset.
Friday 12 Jun 2020
10:23 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

Options
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/util/WebUtil.java
  2. … 2 more files in changeset.
10:18 pm

Marcin Cieslak

LDEV-5038 Add group to user name in lesson monitor sequence tab

Options
    • -7
    • +22
    ./src/java/org/lamsfoundation/lams/util/WebUtil.java
  2. … 2 more files in changeset.
Thursday 21 May 2020
2:46 pm

Marcin Cieslak

LDEV-5025 Allow Assessment other groups' answer rating and commenting

Options
    • -16
    • +19
    ./src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -20
    • +39
    ./src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -57
    • +80
    ./src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -5
    • +9
    ./src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/rating/service/RatingService.java
  6. … 7 more files in changeset.
Tuesday 19 May 2020
11:00 pm

Marcin Cieslak

LDEV-5024 Import QB questions to AE in TBL template

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
  2. … 6 more files in changeset.
2:26 pm

Marcin Cieslak

LDEV-4746 Fix question and option ordering issues.

Options
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200519.sql
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -52
    • +52
    ./.classpath
    • -13
    • +13
    ./.mymetadata
    • -735
    • +735
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -11
    • +11
    ./src/java/org/lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
    • -127
    • +127
    ./src/java/org/lamsfoundation/lams/outcome/Outcome.java
    • -76
    • +76
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java
    • -92
    • +92
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java
    • -152
    • +152
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java
    • -65
    • +65
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java
    • -44
    • +44
    ./src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -291
    • +291
    ./src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -32
    • +32
    ./src/java/org/lamsfoundation/lams/timezone/util/TimezoneIDComparator.java
  13. … 409 more files in changeset.
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -9
    • +40
    ./src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -5
    • +25
    ./src/java/org/lamsfoundation/lams/etherpad/service/IEtherpadService.java
  3. … 7 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200220.sql
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200221.sql
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -23
    • +0
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200219.sql
  6. … 26 more files in changeset.
Friday 24 Apr 2020
9:54 am

Ernie Ghiglione

LDEV-4997 Use UUID_V4 function to create a unique identifier for LAMS server

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql
Thursday 23 Apr 2020
2:04 pm

Marcin Cieslak

Merge branch 'LDEV-4997' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

Options
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/commonContext.xml
  2. … 3 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -52
    • +52
    ./.classpath
    • -13
    • +13
    ./.mymetadata
    • -11
    • +11
    ./src/java/org/lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
    • -16
    • +16
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql
    • -19
    • +19
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql
    • -45
    • +45
    ./src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
    • -103
    • +103
    ./src/java/org/lamsfoundation/lams/outcome/Outcome.java
    • -92
    • +92
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeResult.java
    • -127
    • +127
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java
    • -65
    • +65
    ./src/java/org/lamsfoundation/lams/outcome/OutcomeScaleItem.java
    • -331
    • +331
    ./src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -70
    • +70
    ./src/java/org/lamsfoundation/lams/qb/dto/QbStatsActivityDTO.java
    • -71
    • +71
    ./src/java/org/lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -98
    • +98
    ./src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -32
    • +32
    ./src/java/org/lamsfoundation/lams/timezone/util/TimezoneIDComparator.java
  16. … 449 more files in changeset.