prepare for merge

neodb-social · Oct 22, 2023 · 3110317 · 3110317
1 parent cd8b46c
commit 3110317
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
+26 −661		LICENSE
+25 −2		activities/models/post.py
+13 −10		docs/releases/0.10.rst
+21 −0		docs/releases/0.11.rst
+11 −0		docs/tuning.rst
+5 −0		takahe/settings.py
+18 −0		tests/users/models/test_identity.py
+27 −14		users/models/identity.py
+8 −1		users/views/activitypub.py