lams-github / lams_common

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 35
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
Wednesday 01 Mar 2023
9:29 pm

Marcin Cieslak

# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -1
    • +5
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +34
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -9
    • +17
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  5. … 4 more files in changeset.
9:24 pm

Marcin Cieslak

LDEV-4832 Allow LD location based editing of QB questions

A user is allowed to edit a question if it is used in a learning design

which is in user's private folder, public folder or a course folder

where the user is a monitor.

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +18
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  5. … 1 more file in changeset.
6:50 pm

Marcin Cieslak

LDEV-4832 Allow editing of questions in shared QB collections

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/qb/QbUtils.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +16
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -9
    • +8
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  6. … 2 more files in changeset.
Friday 24 Feb 2023
11:18 pm

Marcin Cieslak

SP-4 Remove duplicates before introducing unique index

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/dbupdates/patch20230219.sql
Sunday 19 Feb 2023
9:49 pm

Marcin Cieslak

SP-4 Prevent duplicates in ext user mapping table

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch20230219.sql
Friday 10 Feb 2023
12:31 am

Marcin Cieslak

LDEV-5363 Add TBL course gradebook export

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -0
    • +150
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
  3. … 7 more files in changeset.
Wednesday 01 Feb 2023
8:23 pm

Marcin Cieslak

LDEV-3600 Display learner even if current activity is marked as complete

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
Saturday 28 Jan 2023
8:20 pm

Marcin Cieslak

LDEV-5358 Always sort groups by name, case insensitive

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/integration/dto/ExtGroupDTO.java
    • -2
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -51
    • +0
    ./java/org/lamsfoundation/lams/learningdesign/GroupComparator.java
    • -6
    • +8
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -7
    • +6
    ./java/org/lamsfoundation/lams/usermanagement/OrganisationGroup.java
  6. … 4 more files in changeset.
1:14 am

Marcin Cieslak

# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -9
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  2. … 8 more files in changeset.
1:08 am

Marcin Cieslak

Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

Options
    • -15
    • +14
    ./java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -12
    • +13
    ./java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -23
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch20230127.sql
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -9
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  6. … 52 more files in changeset.
1:07 am

Marcin Cieslak

LDEV-5357 Use UUIDs for file downloads

Options
    • -14
    • +15
    ./java/org/lamsfoundation/lams/contentrepository/NodeKey.java
    • -13
    • +12
    ./java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +23
    ./java/org/lamsfoundation/lams/dbupdates/patch20230127.sql
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -9
    • +9
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  6. … 52 more files in changeset.
Saturday 14 Jan 2023
4:46 pm

Marcin Cieslak

LDEV-5355 Add event log on Peer Review comment change by monitor

Options
    • -13
    • +16
    ./java/org/lamsfoundation/lams/logevent/service/LogEventService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -2
    • +6
    ./java/org/lamsfoundation/lams/rating/service/RatingService.java
  4. … 3 more files in changeset.
Wednesday 11 Jan 2023
12:14 am

Marcin Cieslak

LDEV-5083 Activity duration can be NULL

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java
Monday 09 Jan 2023
12:35 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
12:31 am

Marcin Cieslak

SP-4 Check if user has any roles on SQL and not Java level

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 1 more file in changeset.
12:31 am

Marcin Cieslak

SP-4 Check if user has any roles on SQL and not Java level

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 1 more file in changeset.
Saturday 07 Jan 2023
1:20 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -31
    • +37
    ./java/org/lamsfoundation/lams/util/WebUtil.java
  2. … 9 more files in changeset.
Friday 06 Jan 2023
2:31 pm

Marcin Cieslak

LDEV-5354 Move course URL copy button to More Options menu

Options
    • -9
    • +0
    ./java/org/lamsfoundation/lams/index/IndexOrgBean.java
  2. … 4 more files in changeset.
Thursday 05 Jan 2023
10:06 pm

Marcin Cieslak

LDEV-5354 Add course URL on index page

Options
    • -6
    • +14
    ./java/org/lamsfoundation/lams/index/IndexOrgBean.java
    • -2
    • +8
    ./java/org/lamsfoundation/lams/util/WebUtil.java
  3. … 7 more files in changeset.
8:49 pm

Marcin Cieslak

LDEV-5354 Rename encoding methods so they can incorporate course ID

Options
    • -31
    • +31
    ./java/org/lamsfoundation/lams/util/WebUtil.java
  2. … 2 more files in changeset.
6:46 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +38
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  3. … 11 more files in changeset.
Friday 23 Dec 2022
8:05 pm

Marcin Cieslak

LDEV-5350 Fix issue with detecting groupings in LD

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
  2. … 2 more files in changeset.
Monday 19 Dec 2022
8:39 pm

Marcin Cieslak

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -0
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +38
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  6. … 6 more files in changeset.
Saturday 17 Dec 2022
9:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  2. … 6 more files in changeset.
8:44 pm

Marcin Cieslak

LDEV-4457 Remove empty groups after spreadsheet import

Options
    • -15
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
Wednesday 30 Nov 2022
6:04 pm

Marcin Cieslak

LDEV-4497 Make sure "ad" word is never a part of content folder ID

UUIDs are cut into folders of two characters and used in image paths.

AdBlock can block an image if there is "ad" in its path. Just make sure

this path piece never occurs.

Options
    • -2
    • +7
    ./java/org/lamsfoundation/lams/util/FileUtil.java
Tuesday 29 Nov 2022
12:18 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -10
    • +6
    ./java/org/lamsfoundation/lams/security/SecurityDAO.java
12:10 am

Marcin Cieslak

LDEV-5341 Add transaction support for all Security Service methods

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -10
    • +6
    ./java/org/lamsfoundation/lams/security/SecurityDAO.java
  3. … 1 more file in changeset.
Saturday 26 Nov 2022
7:10 pm

Marcin Cieslak

LDEV-5200 Prevent invalidated session error from propagating

There seems to be a problem with Infinispan session invalidation similar

to this

https://issues.redhat.com/browse/UNDERTOW-478

We already have got a patched version, but similar problems occur. They

probably have to do with async servlet processing.

Until we upgrade WildFly we need to keep these safety measures.

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -3
    • +21
    ./java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java
7:10 pm

Marcin Cieslak

LDEV-5200 Prevent invalidated session error from propagating

There seems to be a problem with Infinispan session invalidation similar

to this

https://issues.redhat.com/browse/UNDERTOW-478

We already have got a patched version, but similar problems occur. They

probably have to do with async servlet processing.

Until we upgrade WildFly we need to keep these safety measures.

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -3
    • +21
    ./java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java