lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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
Saturday 07 Dec 2019
6:07 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

Options
    • -4
    • +3
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -37
    • +32
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  3. … 1 more file in changeset.
3:39 am

Andrey Balan

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

Options
    • -4
    • +3
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -37
    • +32
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +9
    ./lamsfoundation/lams/util/excel/ExcelRow.java
    • -2
    • +7
    ./lamsfoundation/lams/util/excel/ExcelSheet.java
    • -92
    • +74
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
  6. … 6 more files in changeset.
Friday 06 Dec 2019
2:32 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -1
    • +3
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 11 more files in changeset.
Wednesday 04 Dec 2019
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
    • -1
    • +25
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +22
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +3
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 33 more files in changeset.
2:17 am

Andrey Balan

LDEV-4918 Collapsible subcourses

Options
    • -0
    • +29
    ./lamsfoundation/lams/dbupdates/patch20191202.sql
    • -0
    • +9
    ./lamsfoundation/lams/index/IndexOrgBean.java
    • -0
    • +71
    ./lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.java
    • -0
    • +10
    ./lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -1
    • +16
    ./lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -1
    • +25
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +22
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  9. … 6 more files in changeset.
Saturday 30 Nov 2019
1:42 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/questions/QuestionParser.java
  2. … 3 more files in changeset.
Friday 29 Nov 2019
10:15 pm

Marcin Cieslak

LKC-228 Fix QTI import when question has multiple images

Options
    • -1
    • +1
    ./lamsfoundation/lams/questions/QuestionParser.java
Thursday 28 Nov 2019
6:53 pm

Marcin Cieslak

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

Options
    • -35
    • +40
    ./lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
  2. … 1 more file in changeset.
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
    ./lamsfoundation/lams/util/TransactionRetryService.java
    • -0
    • +7
    ./lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
    • -0
    • +14
    ./lamsfoundation/lams/web/filter/TransactionRetryInterceptor.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
    ./lamsfoundation/lams/integration/security/SsoHandler.java
6:06 pm

Marcin Cieslak

LDEV-3514 Make logs better for transaction retry mechanism

Options
    • -9
    • +8
    ./lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +16
    ./lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
  2. … 19 more files in changeset.
12:21 am

Marcin Cieslak

LDEV-4914 Do not allow NULLs in Lesson settings

Options
    • -0
    • +36
    ./lamsfoundation/lams/dbupdates/patch20191122.sql
    • -91
    • +91
    ./lamsfoundation/lams/lesson/Lesson.java
  3. … 2 more files in changeset.
12:21 am

Marcin Cieslak

LDEV-4914 Do not allow NULLs in Lesson settings

Options
    • -0
    • +36
    ./lamsfoundation/lams/dbupdates/patch20191122.sql
    • -91
    • +91
    ./lamsfoundation/lams/lesson/Lesson.java
  3. … 2 more files in changeset.
Friday 22 Nov 2019
11:55 pm

Marcin Cieslak

LDEV-4030 Prevent failedAttempts overflow in DB

Options
    • -12
    • +6
    ./lamsfoundation/lams/integration/security/SsoHandler.java
11:55 pm

Marcin Cieslak

LDEV-4030 Prevent failedAttempts overflow in DB

Options
    • -12
    • +6
    ./lamsfoundation/lams/integration/security/SsoHandler.java
5:00 pm

Marcin Cieslak

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

Options
    • -3
    • +10
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 1 more file in changeset.
4:08 pm

Marcin Cieslak

LDEV-4912 Add session time information to Logged In Users in sysadmin

Options
    • -3
    • +10
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 2 more files in changeset.
3:32 pm

Marcin Cieslak

LDEV-4746 Make generated question titles longer

Options
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
Thursday 21 Nov 2019
9:36 pm

Marcin Cieslak

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

Conflicts:

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

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

Options
    • -0
    • +3
    ./lamsfoundation/lams/integration/security/SsoHandler.java
  2. … 7 more files in changeset.
9:25 pm

Marcin Cieslak

Merge branch 'SP-3'

Options
    • -3
    • +14
    ./lamsfoundation/lams/integration/ExtServer.java
    • -0
    • +3
    ./lamsfoundation/lams/integration/security/SsoHandler.java
  3. … 6 more files in changeset.
7:44 pm

Marcin Cieslak

LDEV-4746 Make img tag stripping configurable in DB function

Options
    • -3
    • +5
    ./lamsfoundation/lams/dbupdates/patch20190721.sql
    • -11
    • +11
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
1:35 am

Marcin Cieslak

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

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20190808.sql
    • -0
    • +1
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +23
    ./lamsfoundation/lams/qb/service/QbService.java
1:32 am

Marcin Cieslak

LDEV-4844 Fix answer merging for Assessment questions

Options
    • -2
    • +11
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
1:31 am

Marcin Cieslak

LDEV-4844 Allow manual QB question merging

Options
    • -0
    • +2
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +20
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +3
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +28
    ./lamsfoundation/lams/qb/service/QbService.java
  5. … 2 more files in changeset.
Wednesday 20 Nov 2019
9:49 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

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

Options
    • -0
    • +1
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 1 more file in changeset.
8:50 pm

Marcin Cieslak

LDEV-4746 Make options ordered when getting them from DB

Options
    • -0
    • +2
    ./lamsfoundation/lams/qb/model/QbQuestion.java
8:10 pm

Marcin Cieslak

LDEV-4746 Do not string img tags during migration

Options
    • -3
    • +6
    ./lamsfoundation/lams/dbupdates/patch20190721.sql
Tuesday 19 Nov 2019
9:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -14
    • +21
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -41
    • +72
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  3. … 20 more files in changeset.
Monday 18 Nov 2019
10:30 pm

Marcin Cieslak

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

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

Options
    • -5
    • +12
    ./lamsfoundation/lams/learning/service/ILearnerService.java
  2. … 14 more files in changeset.