Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-16 11:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-08-21 10:45:36 -04:00
parent 20e2c8fe67 2f4cf26c59
commit 2d415b5610
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yaml vendored
View File

@@ -63,7 +63,7 @@ jobs:
- 5432:5432
redis:
image: 'redis:8.2.0'
image: 'redis:8.2.1'
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"

2
docker-compose-pgsql.yml
View File

@@ -24,7 +24,7 @@ services:
- postgres-data:/var/lib/postgresql/data
redis:
image: redis:8.2.0-alpine
image: redis:8.2.1-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF

2
docker-compose-redis.yml
View File

@@ -14,7 +14,7 @@ services:
- ./install/docker/setup.json:/usr/src/app/setup.json
redis:
image: redis:8.2.0-alpine
image: redis:8.2.1-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF

2
docker-compose.yml
View File

@@ -24,7 +24,7 @@ services:
- mongo-data:/data/db
- ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
redis:
image: redis:8.2.0-alpine
image: redis:8.2.1-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF

8
install/package.json
View File

@@ -106,9 +106,9 @@
"nodebb-plugin-spam-be-gone": "2.3.2",
"nodebb-plugin-web-push": "0.7.5",
"nodebb-rewards-essentials": "1.0.2",
"nodebb-theme-harmony": "2.1.16",
"nodebb-theme-harmony": "2.1.17",
"nodebb-theme-lavender": "7.1.19",
"nodebb-theme-peace": "2.2.46",
"nodebb-theme-peace": "2.2.47",
"nodebb-theme-persona": "14.1.12",
"nodebb-widget-essentials": "7.0.40",
"nodemailer": "7.0.5",
@@ -122,7 +122,7 @@
"postcss-clean": "1.2.0",
"progress-webpack-plugin": "1.0.16",
"prompt": "1.3.0",
"redis": "5.8.1",
"redis": "5.8.2",
"rimraf": "6.0.1",
"rss": "1.2.2",
"rtlcss": "4.3.0",
@@ -147,7 +147,7 @@
"tough-cookie": "6.0.0",
"undici": "^7.10.0",
"validator": "13.15.15",
"webpack": "5.101.2",
"webpack": "5.101.3",
"webpack-merge": "6.0.1",
"winston": "3.17.0",
"workerpool": "9.3.3",

2
public/language/it/admin/settings/activitypub.json
View File

@@ -19,7 +19,7 @@
"probe-timeout-help": "(Predefinito: 2000) Se la query di ricerca non riceve una risposta entro l'intervallo di tempo impostato, l'utente l'utente sarà indirizzato direttamente al link. Aumenta questo numero se i siti rispondono lentamente e desideri concedere più tempo.",
"rules": "Categorizzazione",
"rules-intro": "Content discovered via ActivityPub can be automatically categorized based on certain rules (e.g. hashtag)",
"rules-intro": "I contenuti scoperti tramite ActivityPub possono essere categorizzati automaticamente in base a determinate regole (ad es. hashtag)",
"rules.modal.title": "Come funziona",
"rules.modal.instructions": "Any incoming content is checked against these categorization rules, and matching content is automatically moved into the category of choice.<br /><br /><strong>N.B.</strong> Content that is already categorized (i.e. in a remote category) will not pass through these rules.",
"rules.modal.values-multiple": "Per abbinare più valori, separa le voci con una virgola (es. <code>uno,due,tre</code>)",