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
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
    ./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
    ./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
    ./lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -20
    • +39
    ./lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -57
    • +80
    ./lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -5
    • +9
    ./lamsfoundation/lams/rating/service/IRatingService.java
    • -5
    • +13
    ./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
    ./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
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +11
    ./lamsfoundation/lams/dbupdates/patch20200519.sql
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

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

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -9
    • +40
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -5
    • +25
    ./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
    ./lamsfoundation/lams/dbupdates/patch20200220.sql
    • -0
    • +19
    ./lamsfoundation/lams/dbupdates/patch20200221.sql
    • -0
    • +8
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +9
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -23
    • +0
    ./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
    ./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
    ./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
    • -11
    • +11
    ./lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
    • -16
    • +16
    ./lamsfoundation/lams/dbupdates/patch20190119.sql
    • -19
    • +19
    ./lamsfoundation/lams/dbupdates/patch20190723.sql
    • -45
    • +45
    ./lamsfoundation/lams/dbupdates/patch20190724.sql
    • -103
    • +103
    ./lamsfoundation/lams/outcome/Outcome.java
    • -92
    • +92
    ./lamsfoundation/lams/outcome/OutcomeResult.java
    • -127
    • +127
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -65
    • +65
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
    • -331
    • +331
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
    • -70
    • +70
    ./lamsfoundation/lams/qb/dto/QbStatsActivityDTO.java
    • -71
    • +71
    ./lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -98
    • +98
    ./lamsfoundation/lams/qb/model/QbCollection.java
    • -32
    • +32
    ./lamsfoundation/lams/timezone/util/TimezoneIDComparator.java
    • -68
    • +68
    ./lamsfoundation/lams/util/CommonConstants.java
  15. … 450 more files in changeset.
Friday 17 Apr 2020
1:47 pm

Marcin Cieslak

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

Options
    • -13
    • +8
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
1:47 pm

Marcin Cieslak

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

Options
    • -13
    • +8
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
Wednesday 15 Apr 2020
10: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
    ./lamsfoundation/lams/dbupdates/patch20200326.sql
    • -1
    • +6
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -0
    • +1
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 1 more file in changeset.
10:16 pm

Marcin Cieslak

LDEV-4997 Allow Etherpad instance sharing between LAMS instances

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

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
    ./lamsfoundation/lams/questions/QuestionWordParser.java
3:33 am

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
    ./lamsfoundation/lams/questions/QuestionWordParser.java
12:48 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/etherpad/util/EtherpadUtil.java
12:48 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/etherpad/util/EtherpadUtil.java
Tuesday 14 Apr 2020
2:57 pm

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
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
2:57 pm

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
    ./lamsfoundation/lams/etherpad/service/EtherpadService.java
Monday 13 Apr 2020
1:21 pm

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
    ./lamsfoundation/lams/etherpad/util/EtherpadUtil.java
  2. … 12 more files in changeset.
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

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

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
    ./lamsfoundation/lams/dao/IBaseDAO.java
    • -0
    • +9
    ./lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -4
    • +19
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -6
    • +16
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
Saturday 04 Apr 2020
8:47 pm

Marcin Cieslak

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

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

Marcin Cieslak

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

Options
    • -1
    • +2
    ./lamsfoundation/lams/qb/QbUtils.java
Friday 03 Apr 2020
9: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
    ./lamsfoundation/lams/dbupdates/patch20200316.sql
    • -3
    • +13
    ./lamsfoundation/lams/index/IndexLessonBean.java
    • -3
    • +18
    ./lamsfoundation/lams/lesson/Lesson.java
    • -0
    • +11
    ./lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +10
    ./lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +9
    ./lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +0
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
  9. … 12 more files in changeset.
Thursday 02 Apr 2020
11: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
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +9
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -3
    • +6
    ./lamsfoundation/lams/qb/service/QbService.java
  5. … 1 more file in changeset.
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

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

Marcin Cieslak

LDEV-4998 Protect activity default questions from modification

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -2
    • +9
    ./lamsfoundation/lams/qb/QbUtils.java
    • -0
    • +2
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +13
    ./lamsfoundation/lams/qb/service/QbService.java
  5. … 2 more files in changeset.