Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 8.1 snapshot #266

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
88f099c
WIP: AI time savings in time sheets.
kreinhard Jan 15, 2025
883c19e
Merge commit '3e690651cbf3583fae61cf380f3a3bc6a0c2884e' into Release-…
kreinhard Jan 20, 2025
26a7fd0
WIP timesheet: saving by AI
kreinhard Jan 21, 2025
f2b0beb
Merge branch 'Release-8.1-SNAPSHOT' into Release-8.1-AI_Timesavings
kreinhard Jan 21, 2025
cbffabd
WIP: time savings by AI
kreinhard Jan 21, 2025
63bf161
Merge branch 'Release-8.1-SNAPSHOT' into Release-8.1-AI_Timesavings
kreinhard Jan 22, 2025
1449f48
WIP: timesavings by AI in timesheets, config param for note added.
kreinhard Jan 22, 2025
73b778a
Merge branch 'Release-8.1-SNAPSHOT' into Release-8.1-AI_Timesavings
kreinhard Jan 22, 2025
fc6a008
JCR: RepoService refactored (prepared for other storages than segment…
kreinhard Jan 23, 2025
918629f
Merge branch 'Release-8.1-SNAPSHOT' into jackrabbit-oak-jcr-rdb-store
kreinhard Jan 23, 2025
54dede5
WIP: JCR RDB storage.
kreinhard Jan 23, 2025
8a1a64c
WIP: JCR RDB storage.
kreinhard Jan 24, 2025
3d89431
WIP: JCR RDB storage.
kreinhard Jan 24, 2025
0f085dd
WIP: JCR RDB storage (restart of storage fails :-(.
kreinhard Jan 25, 2025
54fb665
NOP
kreinhard Jan 25, 2025
7cdc06a
MonthlyEmployeeReport[Week] -> Kotlin
kreinhard Jan 25, 2025
2ec065b
WIP: time savings by AI: TimesheetListPage, MonthlyEmployeeReport
kreinhard Jan 26, 2025
8ebd872
WIP: JCR RDB storage: Test fixed.
kreinhard Jan 26, 2025
e018f77
Merge branch 'Release-8.1-SNAPSHOT' into Release-8.1-AI_Timesavings
kreinhard Jan 26, 2025
9ce9f3f
WIP: time savings by AI
kreinhard Jan 26, 2025
b1d7501
NOP
kreinhard Jan 26, 2025
1fe1832
Merge branch 'develop' into Release-8.1-SNAPSHOT
kreinhard Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ToDo.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
==== Aktuell:
- Änderungskommentar bei Usern/Gruppen (JIRA-Nummern)
- AI timesavings: Zeit bei Eingabe ausrechnen, recent ai texte als vorlage.
- JCR: Tool for removing or recovering orphaned nodes.
- Favoriten bei Scriptausführung für Parameter.
- KI-Anteil in Zeitberichten
Expand All @@ -14,6 +16,7 @@
- Kalendereinträge und Subscriptions.
- LoginProtection: Increases penalty time for DAV only after 5 tries.

- Admin für Datentransfer: show details of nodes, restore orphaned etc.
- Apple for Webauthn4j
- Abwesenheiten
- Fakturaquote Monatsbericht
Expand Down Expand Up @@ -95,6 +98,7 @@ DROP DATABASE projectforge;
CREATE DATABASE projectforge;
----


Orderbooks importieren:
[source]
----
Expand Down
13 changes: 6 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ org-apache-directory-server-apacheds-server-integ = "1.5.7"
org-apache-groovy = "4.0.22"
org-apache-httpcomponents-client5-httpclient5 = "5.4.1"
org-apache-httpcomponents-core5 = "5.3.1" # Needed by httpclient5
org-apache-jackrabbit-oak-jcr = "1.66.0"
org-apache-jackrabbit-oak-segment-tar = "1.66.0"
org-apache-jackrabbit-oak = "1.74.0"
org-apache-poi = "5.3.0"
org-apache-poi-ooxml = "5.3.0"
org-apache-wicket-myextensions = "10.3.0"
Expand All @@ -63,8 +62,6 @@ org-hibernate-validator = "8.0.2.Final"
org-hsqldb-hsqldb = "2.7.4"
org-jetbrains-kotlin = "2.0.21"
org-jetbrains-kotlinx-coroutines-core = "1.9.0"
org-jetbrains-kotlinx-coroutines-slf4j = "1.8.1"
org-jetbrains-intellij-deps-trove4j = "1.0.20200330" # Needed by Kotlin scripting engine. Must match the version of the Kotlin compiler.
org-jfree-jfreechart = "1.5.5"
org-junit-jupiter = "5.10.3"
org-junit-platform-launcher = "1.10.3"
Expand All @@ -75,7 +72,7 @@ org-mockito-kotlin = "5.4.0"
org-mozilla-rhino = "1.7.15"
org-postgresql = "42.7.4"
org-reflections = "0.10.2"
org-springframework-boot = "3.3.6"
org-springframework-boot = "3.3.8"
org-apache-tomcat-embed = "10.1.33" # must match spring-boot
org-springframework-spring = "6.1.16"
org-springframework-security = "6.4.1"
Expand Down Expand Up @@ -151,8 +148,9 @@ org-apache-commons-lang3 = { module = "org.apache.commons:commons-lang3", versio
org-apache-commons-text = { module = "org.apache.commons:commons-text", version.ref = "org-apache-commons-text" }
org-apache-groovy-all = { module = "org.apache.groovy:groovy-all", version.ref = "org-apache-groovy" }
org-apache-httpcomponents-client5-httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "org-apache-httpcomponents-client5-httpclient5" }
org-apache-jackrabbit-oak-jcr = { module = "org.apache.jackrabbit:oak-jcr", version.ref = "org-apache-jackrabbit-oak-jcr" }
org-apache-jackrabbit-oak-segment-tar = { module = "org.apache.jackrabbit:oak-segment-tar", version.ref = "org-apache-jackrabbit-oak-segment-tar" }
org-apache-jackrabbit-oak-jcr = { module = "org.apache.jackrabbit:oak-jcr", version.ref = "org-apache-jackrabbit-oak" }
org-apache-jackrabbit-oak-segment-tar = { module = "org.apache.jackrabbit:oak-segment-tar", version.ref = "org-apache-jackrabbit-oak" }
org-apache-jackrabbit-oak-store-document = { module = "org.apache.jackrabbit:oak-store-document", version.ref = "org-apache-jackrabbit-oak" }
org-apache-logging-log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "org-apache-logging-log4j" }
org-apache-logging-log4j-to-slf4j = { module = "org.apache.logging.log4j:log4j-to-slf4j", version.ref = "org-apache-logging-log4j" }
org-apache-poi = { module = "org.apache.poi:poi", version.ref = "org-apache-poi" }
Expand Down Expand Up @@ -198,6 +196,7 @@ org-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
org-slf4j-jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "org-slf4j" }
org-slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "org-slf4j" }
org-springframework-boot = { module = "org.springframework.boot:spring-boot", version.ref = "org-springframework-boot" }
org-springframework-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure", version.ref = "org-springframework-boot" }
org-springframework-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "org-springframework-boot" }
org-springframework-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "org-springframework-boot" }
org-springframework-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "org-springframework-boot" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import mu.KotlinLogging
import org.projectforge.common.FormatterUtils
import org.projectforge.framework.jcr.AttachmentsService
import org.projectforge.framework.utils.NumberHelper
import org.projectforge.jcr.OakStorage
import org.projectforge.jcr.RepoService
import org.projectforge.plugins.core.PluginAdminService
import org.projectforge.plugins.datatransfer.rest.DataTransferAreaPagesRest
Expand Down Expand Up @@ -124,7 +125,7 @@ class DataTransferJCRCleanUpJob {
val files = mutableListOf<String>()
child.findDescendant(
AttachmentsService.DEFAULT_NODE,
RepoService.NODENAME_FILES
OakStorage.NODENAME_FILES
)?.children?.forEach {
deletedCounter++
deletedSize += it.getProperty("size")?.value?.long ?: 0
Expand Down
2 changes: 2 additions & 0 deletions projectforge-application/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ dependencies {
implementation(libs.org.apache.httpcomponents.client5.httpclient5)
implementation(libs.org.apache.jackrabbit.oak.jcr)
implementation(libs.org.apache.jackrabbit.oak.segment.tar)
implementation(libs.org.apache.jackrabbit.oak.store.document)
implementation(libs.org.apache.tomcat.embed.core)
implementation(libs.org.apache.tomcat.embed.websocket)
implementation(libs.org.apache.poi)
Expand Down Expand Up @@ -196,6 +197,7 @@ dependencies {
implementation(libs.org.postgresql)
implementation(libs.org.reflections)
implementation(libs.org.springframework.boot)
implementation(libs.org.springframework.boot.autoconfigure)
implementation(libs.org.springframework.boot.dependencies)
implementation(libs.org.springframework.boot.starter)
implementation(libs.org.springframework.boot.starter.data.jpa)
Expand Down
Loading
Loading