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
Friday 17 Apr 2020
7:47 am

Marcin Cieslak

LDEV-4997 Fetch API key for every call as it can change in config

Options
    • -13
    • +8
    ./lams/etherpad/service/EtherpadService.java
7:47 am

Marcin Cieslak

LDEV-4997 Fetch API key for every call as it can change in config

Options
    • -13
    • +8
    ./lams/etherpad/service/EtherpadService.java
Wednesday 15 Apr 2020
4:16 pm

Marcin Cieslak

LDEV-4997 Allow Etherpad instance sharing between LAMS instances

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

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

Options
    • -3
    • +3
    ./lams/dbupdates/patch20200326.sql
    • -1
    • +6
    ./lams/etherpad/service/EtherpadService.java
    • -0
    • +1
    ./lams/util/ConfigurationKeys.java
  4. … 1 more file in changeset.
4:16 pm

Marcin Cieslak

LDEV-4997 Allow Etherpad instance sharing between LAMS instances

Options
    • -3
    • +3
    ./lams/dbupdates/patch20200326.sql
    • -1
    • +6
    ./lams/etherpad/service/EtherpadService.java
    • -0
    • +1
    ./lams/util/ConfigurationKeys.java
  4. … 1 more file in changeset.
Tuesday 14 Apr 2020
9:33 pm

Andrey Balan

LDEV-4949 Format question's title properly

* remove html tags and custom "[IMAGE: ]" one

* trim title so it contains 200 characters at max while preserving the

last full word

Options
    • -1
    • +6
    ./lams/questions/QuestionWordParser.java
9:33 pm

Andrey Balan

LDEV-4949 Format question's title properly

* remove html tags and custom "[IMAGE: ]" one

* trim title so it contains 200 characters at max while preserving the

last full word

Cherry pick from branch 5.0

Options
    • -1
    • +6
    ./lams/questions/QuestionWordParser.java
6:48 pm

Marcin Cieslak

LDEV-5002 Allow non-breaking space in Etherpad initial content

Options
    • -1
    • +1
    ./lams/etherpad/util/EtherpadUtil.java
6:48 pm

Marcin Cieslak

LDEV-5002 Allow non-breaking space in Etherpad initial content

Options
    • -1
    • +1
    ./lams/etherpad/util/EtherpadUtil.java
8:57 am

Marcin Cieslak

LDEV-5002 Do not set cookie domain if it is "localhost"

Edge browser does not set a cookie if domain is "localhost".

Options
    • -1
    • +3
    ./lams/etherpad/service/EtherpadService.java
8:57 am

Marcin Cieslak

LDEV-5002 Do not set cookie domain if it is "localhost"

Edge browser does not set a cookie if domain is "localhost".

Options
    • -1
    • +3
    ./lams/etherpad/service/EtherpadService.java
Monday 13 Apr 2020
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +12
    ./lams/etherpad/util/EtherpadUtil.java
  2. … 12 more files in changeset.
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -3
    • +3
    ./lams/etherpad/util/EtherpadUtil.java
  2. … 12 more files in changeset.
Friday 10 Apr 2020
10:46 am

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java

lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java

Options
    • -301
    • +303
    ./lams/dao/IBaseDAO.java
    • -0
    • +9
    ./lams/dao/hibernate/LAMSBaseDAO.java
    • -4
    • +19
    ./lams/usermanagement/service/IUserManagementService.java
    • -6
    • +16
    ./lams/usermanagement/service/UserManagementService.java
Saturday 04 Apr 2020
2:47 pm

Marcin Cieslak

LDEV-5003 Load all necessary objects in one go instead of one by one

Options
    • -0
    • +2
    ./lams/dao/IBaseDAO.java
    • -2
    • +11
    ./lams/dao/hibernate/LAMSBaseDAO.java
    • -3
    • +4
    ./lams/usermanagement/dao/IOrganisationDAO.java
    • -18
    • +25
    ./lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -4
    • +19
    ./lams/usermanagement/service/IUserManagementService.java
    • -10
    • +21
    ./lams/usermanagement/service/UserManagementService.java
  7. … 1 more file in changeset.
Friday 03 Apr 2020
7:14 pm

Marcin Cieslak

LDEV-5004 Fix checking a new question if it is a default question

Options
    • -1
    • +2
    ./lams/qb/QbUtils.java
3:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -1
    • +4
    ./lams/dbupdates/patch20200316.sql
    • -3
    • +13
    ./lams/index/IndexLessonBean.java
    • -3
    • +18
    ./lams/lesson/Lesson.java
    • -0
    • +11
    ./lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +10
    ./lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    ./lams/lesson/service/ILessonService.java
    • -2
    • +9
    ./lams/lesson/service/LessonService.java
    • -2
    • +0
    ./lams/monitoring/service/IMonitoringService.java
  9. … 12 more files in changeset.
Thursday 02 Apr 2020
5:16 pm

Marcin Cieslak

LDEV-4746 Fix QB answer removal on activity removal

Using JPQL caused errors, so a native query has been used.

Options
    • -0
    • +2
    ./lams/qb/dao/IQbDAO.java
    • -0
    • +9
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -3
    • +6
    ./lams/qb/service/QbService.java
  5. … 1 more file in changeset.
9:23 am

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -9
    • +40
    ./lams/etherpad/service/EtherpadService.java
    • -5
    • +25
    ./lams/etherpad/service/IEtherpadService.java
    • -0
    • +12
    ./lams/etherpad/util/EtherpadUtil.java
  4. … 8 more files in changeset.
Wednesday 01 Apr 2020
1:44 pm

Marcin Cieslak

LDEV-4998 Protect activity default questions from modification

Options
    • -0
    • +1
    ./lams/commonContext.xml
    • -2
    • +9
    ./lams/qb/QbUtils.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -0
    • +13
    ./lams/qb/service/QbService.java
  5. … 2 more files in changeset.
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.