lams-github / lams_common / src / java / org

lamsfoundation

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
Tuesday 31 Mar 2020
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +9
    ./lams/questions/Answer.java
    • -0
    • +400
    ./lams/questions/QuestionWordParser.java
    • -3
    • +2
    ./lams/util/zipfile/ZipFileUtil.java
  4. … 13 more files in changeset.
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/questions/questionFile.jsp

Options
    • -0
    • +9
    ./lams/questions/Answer.java
    • -0
    • +404
    ./lams/questions/QuestionWordParser.java
    • -3
    • +2
    ./lams/util/zipfile/ZipFileUtil.java
  4. … 13 more files in changeset.
Monday 30 Mar 2020
7:30 am

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Options
    • -0
    • +22
    ./lams/commonContext.xml
    • -0
    • +14
    ./lams/dbupdates/patch20200326.sql
    • -0
    • +11
    ./lams/etherpad/EtherpadException.java
    • -0
    • +158
    ./lams/etherpad/service/EtherpadService.java
    • -0
    • +39
    ./lams/etherpad/service/IEtherpadService.java
    • -0
    • +10
    ./lams/etherpad/util/EtherpadUtil.java
    • -1
    • +5
    ./lams/util/ConfigurationKeys.java
  8. … 26 more files in changeset.
7:30 am

Marcin Cieslak

LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

Options
    • -49
    • +69
    ./lams/commonContext.xml
    • -0
    • +14
    ./lams/dbupdates/patch20200326.sql
    • -0
    • +11
    ./lams/etherpad/EtherpadException.java
    • -0
    • +158
    ./lams/etherpad/service/EtherpadService.java
    • -0
    • +39
    ./lams/etherpad/service/IEtherpadService.java
    • -0
    • +10
    ./lams/etherpad/util/EtherpadUtil.java
    • -0
    • +3
    ./lams/util/ConfigurationKeys.java
  8. … 25 more files in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -1
    • +6
    ./lams/commonContext.xml
    • -0
    • +19
    ./lams/dbupdates/patch20200316.sql
    • -5
    • +94
    ./lams/index/IndexLessonBean.java
    • -0
    • +90
    ./lams/lesson/FavoriteLesson.java
    • -6
    • +8
    ./lams/lesson/Lesson.java
    • -0
    • +29
    ./lams/lesson/dao/IFavoriteLessonDAO.java
    • -0
    • +10
    ./lams/lesson/dao/ILearnerProgressDAO.java
    • -1
    • +6
    ./lams/lesson/dao/ILessonDAO.java
    • -0
    • +33
    ./lams/lesson/dao/hibernate/FavoriteLessonDAO.java
    • -0
    • +40
    ./lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -1
    • +22
    ./lams/lesson/dao/hibernate/LessonDAO.java
    • -0
    • +5
    ./lams/lesson/service/ILessonService.java
    • -11
    • +21
    ./lams/lesson/service/LessonService.java
    • -0
    • +12
    ./lams/monitoring/service/IMonitoringService.java
    • -0
    • +15
    ./lams/usermanagement/service/IUserManagementService.java
  16. … 184 more files in changeset.
Friday 20 Mar 2020
6:35 am

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -1
    • +3
    ./lams/learning/service/ILearnerService.java
    • -3
    • +6
    ./lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -20
    • +18
    ./lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +8
    ./lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +2
    ./lams/util/AuthoringJsonTags.java
  6. … 17 more files in changeset.
Tuesday 17 Mar 2020
7:18 am

Marcin Cieslak

LDEV-4991 Fix learning outcome query when entering via sysadmin

Options
    • -6
    • +5
    ./lams/outcome/dao/hibernate/OutcomeDAO.java
Monday 16 Mar 2020
3:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +21
    ./lams/dbupdates/patch20200315.sql
    • -1
    • +3
    ./lams/learning/service/ILearnerService.java
    • -6
    • +16
    ./lams/learningdesign/Activity.java
    • -1
    • +1
    ./lams/learningdesign/ContributionTypes.java
    • -0
    • +110
    ./lams/learningdesign/PasswordGateActivity.java
    • -3
    • +6
    ./lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -20
    • +18
    ./lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +3
    ./lams/learningdesign/dto/ValidationErrorDTO.java
    • -0
    • +8
    ./lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +55
    ./lams/learningdesign/strategy/PasswordGateActivityStrategy.java
    • -0
    • +1
    ./lams/tool/SystemTool.java
    • -1
    • +2
    ./lams/util/AuthoringJsonTags.java
  13. … 25 more files in changeset.
Saturday 14 Mar 2020
7:31 pm

Marcin Cieslak

LDEV-4991 Fix SQL conditions when searching for an outcome

Options
    • -7
    • +9
    ./lams/outcome/dao/hibernate/OutcomeDAO.java
Friday 21 Feb 2020
5:41 pm

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -4
    • +6
    ./lams/learningdesign/service/ExportToolContentService.java
  2. … 6 more files in changeset.
5:32 pm

Andrey Balan

LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

Options
    • -17
    • +0
    ./lams/dbupdates/patch20190119.sql
    • -15
    • +0
    ./lams/dbupdates/patch20190126.sql
    • -17
    • +0
    ./lams/dbupdates/patch20190201.sql
    • -16
    • +0
    ./lams/dbupdates/patch20190226.sql
    • -23
    • +0
    ./lams/dbupdates/patch20190313.sql
    • -16
    • +0
    ./lams/dbupdates/patch20190415.sql
    • -15
    • +0
    ./lams/dbupdates/patch20190429.sql
    • -15
    • +0
    ./lams/dbupdates/patch20190520.sql
    • -17
    • +0
    ./lams/dbupdates/patch20190721.sql
    • -813
    • +0
    ./lams/dbupdates/patch20190722.sql
    • -20
    • +0
    ./lams/dbupdates/patch20190723.sql
    • -46
    • +0
    ./lams/dbupdates/patch20190724.sql
    • -14
    • +0
    ./lams/dbupdates/patch20190725.sql
    • -14
    • +0
    ./lams/dbupdates/patch20190806.sql
    • -14
    • +0
    ./lams/dbupdates/patch20190808.sql
  16. … 44 more files in changeset.
Thursday 20 Feb 2020
10:13 am

Marcin Cieslak

LDEV-4962 Use random UUIDs v4 for user portraits

Options
    • -0
    • +23
    ./lams/dbupdates/patch20200219.sql
    • -0
    • +19
    ./lams/dbupdates/patch20200220.sql
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -1
    • +1
    ./lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +1
    ./lams/qb/dao/hibernate/QbDAO.java
    • -12
    • +8
    ./lams/tool/service/LamsToolService.java
    • -1
    • +0
    ./lams/util/CommonConstants.java
  5. … 189 more files in changeset.
Monday 17 Feb 2020
1:29 pm

Marcin Cieslak

LKC-225 Make container auto sync time and interval configurable

Options
    • -0
    • +2
    ./lams/util/ConfigurationKeys.java
  2. … 1 more file in changeset.
Saturday 15 Feb 2020
1:26 am

Andrey Balan

LDEV-4972 Do not rely on activityId of the removed activities

Options
    • -4
    • +6
    ./lams/learningdesign/service/ExportToolContentService.java
12:24 am

Andrey Balan

LDEV-4971 Handle non-numeric version names

Options
    • -3
    • +8
    ./lams/util/VersionUtil.java
Tuesday 11 Feb 2020
4:43 pm

Marcin Cieslak

LKC-225 Make integrated server name configurable

Options
    • -0
    • +1
    ./lams/util/ConfigurationKeys.java
  2. … 1 more file in changeset.
Thursday 06 Feb 2020
1:50 pm

Marcin Cieslak

LKC-225 Add configuration settings for Workflow Automation

Options
    • -5
    • +8
    ./lams/util/ConfigurationKeys.java
  2. … 1 more file in changeset.
Wednesday 05 Feb 2020
6:53 pm

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -3
    • +4
    ./lams/usermanagement/dao/hibernate/UserDAO.java
  2. … 1 more file in changeset.
7:10 am

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -1
    • +1
    ./lams/usermanagement/service/UserManagementService.java
  2. … 25 more files in changeset.
7:10 am

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -1
    • +1
    ./lams/usermanagement/service/UserManagementService.java
  2. … 25 more files in changeset.
Tuesday 04 Feb 2020
11:48 pm

Andrey Balan

LDEV-4876 Take into account useAlternativeUseridParameterName LTI server setting when creating users using membership service

Options
    • -2
    • +7
    ./lams/integration/service/IntegrationService.java
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -4
    • +10
    ./lams/contentrepository/NodeKey.java
    • -5
    • +13
    ./lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +23
    ./lams/dbupdates/patch20200204.sql
    • -9
    • +10
    ./lams/usermanagement/User.java
    • -4
    • +4
    ./lams/usermanagement/dao/hibernate/UserDAO.java
    • -4
    • +4
    ./lams/usermanagement/dto/UserDTO.java
    • -6
    • +8
    ./lams/usermanagement/service/UserManagementService.java
    • -7
    • +3
    ./lams/util/WebUtil.java
  9. … 28 more files in changeset.
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

Options
    • -14
    • +14
    ./lams/confidencelevel/ConfidenceLevelDTO.java
    • -4
    • +10
    ./lams/contentrepository/NodeKey.java
    • -5
    • +13
    ./lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +23
    ./lams/dbupdates/patch20200204.sql
    • -9
    • +10
    ./lams/usermanagement/User.java
    • -4
    • +4
    ./lams/usermanagement/dao/hibernate/UserDAO.java
    • -4
    • +4
    ./lams/usermanagement/dto/UserDTO.java
    • -6
    • +8
    ./lams/usermanagement/service/UserManagementService.java
    • -538
    • +538
    ./lams/util/WebUtil.java
  10. … 30 more files in changeset.
Friday 31 Jan 2020
9:55 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +260
    ./lams/learningdesign/McqImportContentVersionFilter.java
    • -18
    • +30
    ./lams/learningdesign/service/ExportToolContentService.java
  3. … 1 more file in changeset.
Wednesday 29 Jan 2020
11:00 pm

Andrey Balan

LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time

Options
    • -0
    • +22
    ./lams/dbupdates/patch20200129.sql
  2. … 1 more file in changeset.
Wednesday 22 Jan 2020
9:19 am

Marcin Cieslak

LDEV-4914 Fall back to default settings values when creating a lesson

Options
    • -36
    • +36
    ./lams/lesson/Lesson.java
Sunday 19 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    ./lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190415.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190429.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190806.sql
    • -2
    • +2
    ./lams/dbupdates/patch20191009.sql
  8. … 70 more files in changeset.
8:25 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lams/dbupdates/patch0013_updateFrom21.sql
    • -2
    • +2
    ./lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190119.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190126.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190201.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190226.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190313.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190415.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190429.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190520.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190723.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190724.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190725.sql
    • -2
    • +2
    ./lams/dbupdates/patch20190806.sql
  16. … 87 more files in changeset.
Thursday 16 Jan 2020
9:24 am

Marcin Cieslak

LDEV-4846 Prevent creation of QB questions with missing content folder

Options
    • -0
    • +12
    ./lams/dbupdates/patch20200116.sql
    • -0
    • +4
    ./lams/qb/service/QbService.java