prepare for merge

This commit is contained in:
Your Name 2023-10-22 17:24:07 -04:00 committed by Henri Dickson
parent cd8b46c9c5
commit 3110317bd3
5 changed files with 13 additions and 14 deletions

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "neodb-takahe"] [submodule "neodb-takahe"]
path = neodb-takahe path = neodb-takahe
url = https://github.com/alphatownsman/neodb-takahe.git url = https://github.com/neodb-social/neodb-takahe.git
branch = neodb branch = neodb

View file

@ -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 * eligible items, e.g. podcasts and albums, are playable in feed
+ link Fediverse account and import social graph + link Fediverse account and import social graph
+ share collections and reviews to Fediverse ~~and Twitter~~ feed + 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 - Other
+ i18n/language support are planned + i18n/language support are planned

View file

@ -117,14 +117,14 @@ a typical neodb folder after starting up should look like:
``` ```
mysite mysite
├── data # neodb data folder, location can be changed via NEODB_DATA in .env ├── data # neodb data folder, location can be changed via NEODB_DATA in .env
   ├── neodb-db # neodb database ├── neodb-db # neodb database
   ├── neodb-media # uid must be 1000 (app user in docker image), chmod if not so ├── neodb-media # uid must be 1000 (app user in docker image), chmod if not so
   ├── redis # neodb/takahe cache ├── redis # neodb/takahe cache
   ├── takahe-cache # uid must be 33 (www-data user in docker image), chmod if not so ├── takahe-cache # uid must be 33 (www-data user in docker image), chmod if not so
   ├── takahe-db # neodb database ├── takahe-db # neodb database
   ├── takahe-media # uid must be 1000 (app user in docker image), chmod if not so ├── takahe-media # uid must be 1000 (app user in docker image), chmod if not so
   ├── typesense # neodb search index ├── typesense # neodb search index
   └── www-root # neodb web root for robots.txt, logo.png and etc └── www-root # neodb web root for robots.txt, logo.png and etc
└── config └── config
├── compose.yml # copied from neodb release ├── compose.yml # copied from neodb release
└── .env # your configuration, see neodb.env.example └── .env # your configuration, see neodb.env.example

@ -1 +1 @@
Subproject commit f1b587c909d504e822ff58613cc0a3692dff104f Subproject commit 25ead63fb1cacb34cf3f8a2e0706843636f78034

View file

@ -1,10 +1,9 @@
cachetools cachetools
dateparser dateparser
discord.py discord.py
django~=4.2.5 django~=4.2.6
django-anymail django-anymail
#django-auditlog @ git+https://github.com/jazzband/django-auditlog.git@45591463e8192b4ac0095e259cc4dcea0ac2fd6c django-auditlog>=3.0.0-beta.2
django-auditlog>=3.0.0-beta.1
django-bleach django-bleach
django-compressor django-compressor
django-environ django-environ