jcoffey-dev
b2ded0a776
Five conflicts, resolved: - crates/common/src/auth/authentication.rs: upstream's get_directory_for_token and JwtClaims replace extract_jwt_domain; the per-domain directory code (DIR-1, DIR-5 to DIR-7) is kept, and the token lookup routes through it. The release's one new Enterprise snippet was the body of get_directory_for_issuer, which stays returning None: a token naming no address gets the server default, as DIR-2 specifies and as v0.16.22 did. - crates/common/src/manager/application.rs: upstream's rewrite of the tests, with the temp directory names renamed again, and the 5(a) notice the name-purge change should have added. - crates/common/src/network/mta.rs: both sides' imports. - crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.23. - Cargo.lock: upstream's, with the fork's crates added by Cargo.
38 lines
903 B
TOML
38 lines
903 B
TOML
[package]
|
|
name = "groupware"
|
|
version = "0.16.23"
|
|
edition = "2024"
|
|
|
|
[dependencies]
|
|
utils = { path = "../utils" }
|
|
store = { path = "../store" }
|
|
common = { path = "../common" }
|
|
types = { path = "../types" }
|
|
trc = { path = "../trc" }
|
|
nlp = { path = "../nlp" }
|
|
registry = { path = "../registry" }
|
|
inbuxa-features = { path = "../features" }
|
|
calcard = { version = "0.3", features = ["rkyv"] }
|
|
hashify = "0.2"
|
|
rkyv = { version = "0.8.18", features = ["little_endian"] }
|
|
percent-encoding = "2.3.2"
|
|
compact_str = "0.10.0"
|
|
ahash = { version = "0.8" }
|
|
indexmap = "2.14.1"
|
|
chrono = "0.4.45"
|
|
icu_locale_core = "2"
|
|
icu_provider = { version = "2", features = ["sync"] }
|
|
icu_plurals = "2"
|
|
serde = { version = "1.0", features = ["derive"]}
|
|
serde_json = "1.0"
|
|
icu_datetime = { version = "~2.3", features = ["unstable_chrono_0_4"] }
|
|
|
|
[features]
|
|
test_mode = []
|
|
enterprise = []
|
|
|
|
[dev-dependencies]
|
|
|
|
[lints]
|
|
workspace = true
|