lams-github / lams_tool_doku / src / java / org

lamsfoundation

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
Saturday 02 Mar 2024
4:27 pm

Marcin Cieslak

Merge branch 'LAI-9' into v4.8

# Conflicts:

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

# lams_tool_doku/web/pages/monitoring/summary.jsp

Options
    • -0
    • +11
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +104
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 2 more files in changeset.
Thursday 29 Feb 2024
7:32 pm

Marcin Cieslak

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

Options
    • -3
    • +2
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -24
    • +11
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 33 more files in changeset.
Sunday 21 Jan 2024
5:30 pm

Marcin Cieslak

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

# Conflicts:

# lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -5
    • +6
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +4
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 9 more files in changeset.
Friday 19 Jan 2024
7:45 pm

Marcin Cieslak

LDEV-5401 Hide individual extension from widget after learner finished

Options
    • -5
    • +6
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +4
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 8 more files in changeset.
Wednesday 17 Jan 2024
8:31 pm

Marcin Cieslak

LAI-9 Make AI learning outcomes persistent

Options
    • -1
    • +2
    ./lams/tool/dokumaran/dbupdates/patch20240116.sql
    • -0
    • +13
    ./lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +17
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  4. … 2 more files in changeset.
8:05 pm

Marcin Cieslak

LAI-9 Extract learning outcomes from LD and activity descriptions

Options
    • -10
    • +44
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
Tuesday 16 Jan 2024
8:43 pm

Marcin Cieslak

LAI-9 Make AI-generated reviews persistent

Options
    • -0
    • +14
    ./lams/tool/dokumaran/dbupdates/patch20240116.sql
    • -0
    • +9
    ./lams/tool/dokumaran/dto/SessionDTO.java
    • -0
    • +11
    ./lams/tool/dokumaran/model/DokumaranSession.java
    • -0
    • +1
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -5
    • +20
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  6. … 1 more file in changeset.
8:23 pm

Marcin Cieslak

LAI-9 Use fixed criteria and HTML formatting to produce Doku AI review

Options
    • -1
    • +1
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
Tuesday 09 Jan 2024
4:51 pm

Marcin Cieslak

LDEV-5436 Fix marks table sorting in Doku and Whiteboard

There was never first or last name or marks sorting implemented. Just full name, ascending or descending.

Options
    • -16
    • +7
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 4 more files in changeset.
4:41 pm

Marcin Cieslak

LDEV-5436 Project-wide user sorting by last then first name

Options
    • -1
    • +6
    ./lams/tool/dokumaran/model/DokumaranUser.java
    • -3
    • +2
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -9
    • +5
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  4. … 148 more files in changeset.
Thursday 04 Jan 2024
9:55 pm

Marcin Cieslak

LAI-9 Add AI review API calls

Options
    • -0
    • +10
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +3
    ./lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +35
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  4. … 4 more files in changeset.
7:38 pm

Marcin Cieslak

LAI-9 Add AI review UI in activity monitoring

Options
    • -0
    • +3
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
Thursday 28 Dec 2023
5:09 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

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

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -95
    • +19
    ./lams/tool/dokumaran/service/DokumaranService.java
  2. … 34 more files in changeset.
4:04 am

Andrey Balan

LDEV-5425 Remove "End of activity" notebook from *all* tools

Options
    • -8
    • +0
    ./lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +15
    ./lams/tool/dokumaran/dbupdates/patch20231221.sql
    • -1
    • +0
    ./lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -90
    • +0
    ./lams/tool/dokumaran/dto/ReflectDTO.java
    • -22
    • +0
    ./lams/tool/dokumaran/model/Dokumaran.java
    • -95
    • +19
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -43
    • +6
    ./lams/tool/dokumaran/service/IDokumaranService.java
    • -40
    • +0
    ./lams/tool/dokumaran/util/ReflectDTOComparator.java
    • -86
    • +15
    ./lams/tool/dokumaran/web/controller/LearningController.java
    • -24
    • +38
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
    • -1
    • +0
    ./lams/tool/dokumaran/web/form/DokumaranForm.java
    • -66
    • +0
    ./lams/tool/dokumaran/web/form/ReflectionForm.java
  13. … 508 more files in changeset.
Friday 22 Dec 2023
11:00 pm

Marcin Cieslak

LDEV-5433 Squash DB patches and update versions

Options
    • -14
    • +0
    ./lams/tool/dokumaran/dbupdates/patch20220920.sql
    • -14
    • +0
    ./lams/tool/dokumaran/dbupdates/patch20221116.sql
    • -14
    • +0
    ./lams/tool/dokumaran/dbupdates/patch20230330.sql
    • -0
    • +12
    ./lams/tool/dokumaran/dbupdates/patch20230330_updateTo47.sql
    • -0
    • +13
    ./lams/tool/dokumaran/dbupdates/patch20230331.sql
  6. … 103 more files in changeset.
Thursday 21 Dec 2023
4:42 pm

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -10
    • +20
    ./lams/tool/dokumaran/service/DokumaranService.java
  2. … 38 more files in changeset.
Thursday 16 Nov 2023
7:28 am

Marcin Cieslak

Merge v4.7 into LDEV-5397

Options
    • -1
    • +0
    ./lams/tool/dokumaran/web/controller/LearningController.java
  2. … 79 more files in changeset.
Thursday 19 Oct 2023
6:11 pm

Marcin Cieslak

LDEV-5415 Allow skipping Gallery Walk

Options
    • -6
    • +43
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -2
    • +4
    ./lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +9
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  4. … 13 more files in changeset.
2:20 am

Andrey Balan

LDEV-5397 bootstrap5 doKu tool

Options
    • -7
    • +0
    ./lams/tool/dokumaran/DokumaranConstants.java
  2. … 6 more files in changeset.
Tuesday 17 Oct 2023
7:05 pm

Marcin Cieslak

LDEV-5401 Fix timer not starting on multiple learners entering activity

Options
    • -2
    • +2
    ./lams/tool/dokumaran/service/DokumaranService.java
  2. … 3 more files in changeset.
Saturday 14 Oct 2023
2:05 pm

Marcin Cieslak

LDEV-5204 Fix leader finished detection

Also fix misleading session invalidated warnings

Options
    • -1
    • +0
    ./lams/tool/dokumaran/web/controller/LearningController.java
  2. … 4 more files in changeset.
Friday 29 Sep 2023
4:05 am

Andrey Balan

LDEV-5397 Switch to server side redirects

Options
    • -2
    • +0
    ./lams/tool/dokumaran/DokumaranConstants.java
    • -34
    • +9
    ./lams/tool/dokumaran/web/controller/LearningController.java
  3. … 20 more files in changeset.
Sunday 13 Aug 2023
6:11 am

Andrey Balan

LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

Options
    • -3
    • +3
    ./lams/tool/dokumaran/web/controller/LearningController.java
  2. … 42 more files in changeset.
Tuesday 08 Aug 2023
10:37 pm

Marcin Cieslak

LDEV-5391 Bump SQL patch version so it does not get skipped on update

Options
    • -25
    • +0
    ./lams/tool/dokumaran/dbupdates/patch20230504.sql
    • -0
    • +25
    ./lams/tool/dokumaran/dbupdates/patch20230808.sql
Monday 24 Jul 2023
10:31 pm

Marcin Cieslak

LDEV-5391 Add Gallery Walk cluster view

Options
    • -2
    • +4
    ./lams/tool/dokumaran/model/DokumaranSession.java
    • -2
    • +6
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./lams/tool/dokumaran/service/IDokumaranService.java
    • -14
    • +3
    ./lams/tool/dokumaran/util/DokumaranSessionComparator.java
    • -0
    • +32
    ./lams/tool/dokumaran/util/DokumaranSessionNameComparator.java
    • -0
    • +15
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  7. … 5 more files in changeset.
8:30 pm

Marcin Cieslak

LDEV-5391 Move cluster building logic to core for other tools to use

Options
    • -66
    • +20
    ./lams/tool/dokumaran/service/DokumaranService.java
  2. … 2 more files in changeset.
Sunday 16 Jul 2023
6:02 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

Options
    • -19
    • +18
    ./lams/tool/dokumaran/model/Dokumaran.java
    • -18
    • +130
    ./lams/tool/dokumaran/service/DokumaranService.java
  3. … 37 more files in changeset.
Friday 23 Jun 2023
11:33 pm

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute timer to other tools

Options
    • -1
    • +5
    ./lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +15
    ./lams/tool/dokumaran/dbupdates/patch20230621.sql
    • -11
    • +24
    ./lams/tool/dokumaran/model/Dokumaran.java
    • -1
    • +51
    ./lams/tool/dokumaran/service/DokumaranService.java
    • -5
    • +6
    ./lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
    • -5
    • +26
    ./lams/tool/dokumaran/web/controller/MonitoringController.java
  7. … 37 more files in changeset.
Thursday 22 Jun 2023
2:10 am

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute time limit authoring and learning

Options
    • -1
    • +1
    ./lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
  2. … 16 more files in changeset.
Friday 26 May 2023
3:46 am

Marcin Cieslak

LDEV-5041 Prevent resetting relative time limit

Options
    • -53
    • +43
    ./lams/tool/dokumaran/service/DokumaranService.java
  2. … 3 more files in changeset.