From 3110317bd3f5a2d7ea4db96c252b360cb7463ef0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Oct 2023 17:24:07 -0400 Subject: [PATCH] prepare for merge --- .gitmodules | 2 +- README.md | 2 +- doc/install-docker.md | 16 ++++++++-------- neodb-takahe | 2 +- requirements.txt | 5 ++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index 77830475..027a9dfa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "neodb-takahe"] path = neodb-takahe - url = https://github.com/alphatownsman/neodb-takahe.git + url = https://github.com/neodb-social/neodb-takahe.git branch = neodb diff --git a/README.md b/README.md index b8000fd2..540d76a4 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Boofilsic/NeoDB is an open source project and free service to help users manage, * eligible items, e.g. podcasts and albums, are playable in feed + link Fediverse account and import social graph + share collections and reviews to Fediverse ~~and Twitter~~ feed - + ActivityPub support is under development, a pre-alpha version is available for developers as [docker image](https://hub.docker.com/r/neodb/neodb) + + ActivityPub support is under active development - Other + i18n/language support are planned diff --git a/doc/install-docker.md b/doc/install-docker.md index 1236ca40..20b4655b 100644 --- a/doc/install-docker.md +++ b/doc/install-docker.md @@ -117,14 +117,14 @@ a typical neodb folder after starting up should look like: ``` mysite ├── data # neodb data folder, location can be changed via NEODB_DATA in .env -│   ├── neodb-db # neodb database -│   ├── neodb-media # uid must be 1000 (app user in docker image), chmod if not so -│   ├── redis # neodb/takahe cache -│   ├── takahe-cache # uid must be 33 (www-data user in docker image), chmod if not so -│   ├── takahe-db # neodb database -│   ├── takahe-media # uid must be 1000 (app user in docker image), chmod if not so -│   ├── typesense # neodb search index -│   └── www-root # neodb web root for robots.txt, logo.png and etc +│ ├── neodb-db # neodb database +│ ├── neodb-media # uid must be 1000 (app user in docker image), chmod if not so +│ ├── redis # neodb/takahe cache +│ ├── takahe-cache # uid must be 33 (www-data user in docker image), chmod if not so +│ ├── takahe-db # neodb database +│ ├── takahe-media # uid must be 1000 (app user in docker image), chmod if not so +│ ├── typesense # neodb search index +│ └── www-root # neodb web root for robots.txt, logo.png and etc └── config ├── compose.yml # copied from neodb release └── .env # your configuration, see neodb.env.example diff --git a/neodb-takahe b/neodb-takahe index f1b587c9..25ead63f 160000 --- a/neodb-takahe +++ b/neodb-takahe @@ -1 +1 @@ -Subproject commit f1b587c909d504e822ff58613cc0a3692dff104f +Subproject commit 25ead63fb1cacb34cf3f8a2e0706843636f78034 diff --git a/requirements.txt b/requirements.txt index 7f474c1a..05b0437a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,9 @@ cachetools dateparser discord.py -django~=4.2.5 +django~=4.2.6 django-anymail -#django-auditlog @ git+https://github.com/jazzband/django-auditlog.git@45591463e8192b4ac0095e259cc4dcea0ac2fd6c -django-auditlog>=3.0.0-beta.1 +django-auditlog>=3.0.0-beta.2 django-bleach django-compressor django-environ