lams-github / lams_tool_doku / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 9
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
Monday 31 Oct 2022
8:19 am

Marcin Cieslak

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

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

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

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 35 more files in changeset.
Thursday 27 Oct 2022
1:47 pm

Marcin Cieslak

LDEV-5341 Refactor Security Service

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 35 more files in changeset.
Wednesday 21 Sep 2022
7:56 am

Marcin Cieslak

LDEV-5328 Squash DB patches and update versions

Options
    • -19
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210105.sql
    • -36
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210210.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210426.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728.sql
    • -0
    • +49
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728_updateTo46.sql
    • -0
    • +14
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20220920.sql
  8. … 148 more files in changeset.
Tuesday 12 Jul 2022
8:26 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL Doku AES tab to new UI

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
Monday 30 May 2022
4:39 pm

Marcin Cieslak

LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

Options
    • -6
    • +7
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 29 more files in changeset.
Monday 31 Jan 2022
10:43 am

Marcin Cieslak

LDEV-5113 Make manual grading the default gradebook output for doKu

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
Wednesday 03 Nov 2021
3:53 pm

Marcin Cieslak

LDEV-5142 Do not copy stale absolute time limit on activity clone

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  2. … 3 more files in changeset.
Wednesday 27 Oct 2021
12:55 pm

Marcin Cieslak

LDEV-4411 Cache fetching Dokumaran by content ID

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranDAOHibernate.java
Wednesday 28 Jul 2021
2:32 pm

Marcin Cieslak

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

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +7
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
1:52 pm

Marcin Cieslak

LDEV-5222 Allow reediting answers within Gallery Walk in doKu

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728.sql
    • -0
    • +11
    ./lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -3
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  6. … 3 more files in changeset.
Thursday 22 Jul 2021
9:34 am

Marcin Cieslak

LDEV-5223 Add SameSite=None to LAMS-generated sessionID cookie

Options
    • -7
    • +8
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -2
    • +4
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -5
    • +2
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  5. … 3 more files in changeset.
Monday 19 Jul 2021
12:22 pm

Marcin Cieslak

LDEV-5222 Allow activity reedit after Gallery Walk was finished

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 3 more files in changeset.
9:44 am

Marcin Cieslak

LDEV-5222 In Doku allow learner reedit after Gallery Walks has started

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +7
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  4. … 2 more files in changeset.
Friday 21 May 2021
9:21 pm

Marcin Cieslak

LDEV-5142 Show consistent timer to group members with leader

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -0
    • +11
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -10
    • +19
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -3
    • +6
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -1
    • +7
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
Monday 26 Apr 2021
2:19 pm

Marcin Cieslak

LDEV-5122 Use blank Etherpad by default in doKu authoring

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210426.sql
Wednesday 24 Mar 2021
6:23 pm

Marcin Cieslak

LDEV-5138 If leader entered activity, any learner can set him as leader

Options
    • -2
    • +6
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 6 more files in changeset.
Thursday 04 Mar 2021
4:58 pm

Marcin Cieslak

LDEV-5142 Fix timing limits issues in Doku

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  2. … 1 more file in changeset.
Sunday 28 Feb 2021
7:57 am

Marcin Cieslak

LDEV-5185 Introduce advanced timing limits in Scratchie

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
  2. … 10 more files in changeset.
Saturday 13 Feb 2021
4:12 pm

Marcin Cieslak

LDEV-5173 Show which learner is leader in Doku monitoring

Options
    • -28
    • +34
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
Thursday 11 Feb 2021
1:33 pm

Marcin Cieslak

LDEV-5142 Introduce advanced time limits for Doku

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -11
    • +0
    ./lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -0
    • +36
    ./lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210210.sql
    • -0
    • +3
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -22
    • +29
    ./lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -38
    • +10
    ./lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java
    • -53
    • +38
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -17
    • +9
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -14
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -170
    • +46
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
    • -29
    • +172
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
  14. … 12 more files in changeset.
Tuesday 09 Feb 2021
11:21 am

Marcin Cieslak

LDEV-5144 Introduce doKu as AE in TBL monitoring

Options
    • -1
    • +12
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 8 more files in changeset.
Thursday 04 Feb 2021
5:21 pm

Marcin Cieslak

LDEV-5145 Add gallery walk read-only feature and instructions

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 4 more files in changeset.
Wednesday 03 Feb 2021
6:29 pm

Marcin Cieslak

LDEV-5145 Add doKu gallery walk support in TBL template

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 3 more files in changeset.
6:17 pm

Marcin Cieslak

LDEV-5145 Introduce Doku AE in TBL template back-end

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 2 more files in changeset.
Friday 29 Jan 2021
9:11 pm

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -2
    • +14
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +12
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 20 more files in changeset.
Thursday 28 Jan 2021
5:42 pm

Marcin Cieslak

LDEV-5143 Allow changing leader if activity is not grouped

Options
    • -5
    • +1
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 4 more files in changeset.
Monday 25 Jan 2021
10:29 pm

Marcin Cieslak

LDEV-5143 Allow changing leader in Dokumaran monitoring

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +18
    ./lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -0
    • +36
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +10
    ./lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  6. … 4 more files in changeset.
Sunday 24 Jan 2021
3:59 pm

Marcin Cieslak

LDEV-5143 Improve layout of wait for leader and change leader screens.

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 15 more files in changeset.
Monday 11 Jan 2021
6:42 pm

Marcin Cieslak

LDEV-5025, LDEV-5120 Softly remove duplicate rating criteria

For Assessment and Dokumaran we only allow one rating criterion each. On

high load, after a gate was opened, there is a chance that 2 learners

will detect no criteria and both will create one, resulting a duplicate

criterion. Instead of throwing a hard exception and rendering the

activity unusable, just remove the duplicate criterion ignoring any

exceptions. This is lighter than having a multi-node synchronization.

Options
    • -4
    • +23
    ./lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +9
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  3. … 1 more file in changeset.
Thursday 07 Jan 2021
12:49 pm

Marcin Cieslak

LDEV-5141 Correctly display Finish button to non-leaders

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 1 more file in changeset.