Commit graph

3341 commits

Author SHA1 Message Date
Mouse Reeve
5f783e4fd1 Merge branch 'main' into production 2021-04-13 18:39:45 -07:00
Mouse Reeve
5f17b0f1e4
Merge pull request #932 from bookwyrm-social/inbox-error
Fixes logic error in checking sender
2021-04-13 18:39:22 -07:00
Mouse Reeve
00c6b7e6e0 Fixes regex group 2021-04-13 18:26:54 -07:00
Mouse Reeve
e8d1c04712 Fixes logic error in checking sender 2021-04-13 18:04:54 -07:00
Mouse Reeve
850add1186
Merge pull request #931 from bookwyrm-social/readme-docs
Fixes links from readme to docs
2021-04-13 15:56:39 -07:00
Mouse Reeve
d54286b571 Merge branch 'main' into production 2021-04-13 13:12:44 -07:00
Mouse Reeve
3c82d05b3b wording fix 2021-04-13 12:17:07 -07:00
Mouse Reeve
df258859fe more links 2021-04-13 12:16:19 -07:00
Mouse Reeve
e589396be2 Fixes links from readme to docs 2021-04-13 12:15:14 -07:00
Mouse Reeve
8ec93398ce
Merge pull request #930 from bookwyrm-social/readme-docs
Updates README for new docs website
2021-04-13 11:42:56 -07:00
Mouse Reeve
43581d75bc Updates README for new docs website 2021-04-13 10:26:46 -07:00
Mouse Reeve
20cb173150
Merge pull request #928 from mouse-reeve/blocklist
Allow admins to upload domain blocklists
2021-04-12 15:23:51 -07:00
Mouse Reeve
ba48fcd6f7 Fixes markdown formatting 2021-04-12 15:11:01 -07:00
Mouse Reeve
822e2e1a93 Python formatting 2021-04-12 15:09:50 -07:00
Mouse Reeve
a907dfdce7 Adds tests for block lists 2021-04-12 15:08:10 -07:00
Mouse Reeve
901e7f69d4 Allow admins to upload domain blocklists
Fixes #804
2021-04-12 14:23:51 -07:00
Mouse Reeve
1bc8526710
Merge pull request #925 from tofuwabohu/split-readme-into-different-files
Split readme into different files
2021-04-12 13:00:16 -07:00
tofuwabohu
14d5609002 Indentation in md 2021-04-12 20:44:55 +02:00
tofuwabohu
90b1315ae5 Apply merge changes to INSTALLATION instructions too 2021-04-12 20:17:58 +02:00
tofuwabohu
afed0de59a Resolve merge conflicts 2021-04-12 20:12:31 +02:00
tofuwabohu
0ba8fe862d
Merge pull request #9 from mouse-reeve/main
Merge
2021-04-12 20:01:49 +02:00
Mouse Reeve
a1e28d810d
Merge pull request #881 from mouse-reeve/domain-block
Block federation at the domain level
2021-04-12 10:41:02 -07:00
Mouse Reeve
bb352439d3 Fixes views test for federation unblock 2021-04-12 10:27:29 -07:00
Mouse Reeve
878b3c6fe8 Only reactivate appropriate users when undoing domain block 2021-04-12 10:16:03 -07:00
Mouse Reeve
93fe091034 Adds field for user deactivation reason 2021-04-12 09:51:10 -07:00
Mouse Reeve
a8abc3f649
Merge pull request #922 from void-witch/fix-date
add regression tests for published dates not being saved
2021-04-12 09:39:52 -07:00
Mouse Reeve
fa762bc107
Merge pull request #871 from SavinaRoja/857-ease-production
Easier to deploy by avoiding merge conflicts in production
2021-04-12 09:34:38 -07:00
Mouse Reeve
42e08c04e2
Merge pull request #926 from void-witch/readme-fixes
update links in README and {bookwyrm,celerywyrm}/settings.py files
2021-04-12 09:29:04 -07:00
n2no1
92e9ff6cff update links in README and {bookwyrm,celerywyrm}/settings.py files
the link to celery's homepage has been dead for at least several months
activitypub.rocks now supports tls (yay!)
the links to django's docs were for older versions of django than what bookwyrm uses
2021-04-12 11:56:26 -04:00
Mouse Reeve
8f3601d4cd Adds redis mocks to base model tests 2021-04-12 06:44:50 -07:00
Mouse Reeve
c8812c48c1 Use local user in test 2021-04-11 11:58:00 -07:00
Mouse Reeve
08586e348c Adds users to base model mock 2021-04-11 10:55:13 -07:00
Mouse Reeve
db4519b2e1 Fixes visible_to_user check for non-federated objs
why did this cause a problem _now_??
2021-04-11 10:45:08 -07:00
Mouse Reeve
659986771f Edit notes on federated servers 2021-04-11 10:36:40 -07:00
Pablo Barton
d38efa9a9d Easier to deploy by avoiding merge conflicts in production 2021-04-11 13:12:50 -04:00
Mouse Reeve
96d15d3d57 Adds merge migration 2021-04-11 10:05:36 -07:00
Your Name
6a408e6252 Adds final newlines 2021-04-11 19:03:16 +02:00
Mouse Reeve
77caf1a8fa Merge branch 'main' into domain-block 2021-04-11 10:02:11 -07:00
Your Name
a681065a2b Fixes link 2021-04-11 18:58:30 +02:00
Mouse Reeve
b552634a87 Make sure goal exists before checking perms 2021-04-11 09:58:03 -07:00
Your Name
787022826e Puts Installation and Contributing instruction in their own files. 2021-04-11 18:57:14 +02:00
tofuwabohu
9a6aed4efa
Merge pull request #8 from mouse-reeve/main
Merge
2021-04-11 18:53:22 +02:00
Mouse Reeve
32e2bea52c
Merge pull request #912 from mouse-reeve/collection-item-refacotr
Collection item refactor
2021-04-11 09:51:13 -07:00
Mouse Reeve
edf3fad54d Make sure user is available when testing blocks 2021-04-11 09:42:55 -07:00
Mouse Reeve
274ddeed85 Removes verbose flag on unit tests 2021-04-11 09:34:28 -07:00
Mouse Reeve
b6a7871b04 Makes visibility evaluator a model function 2021-04-11 09:31:18 -07:00
Mouse Reeve
26f16cf5a4 Limit broadcast with viewer-aware users
Removes inactive or blocked users
2021-04-11 09:09:13 -07:00
Mouse Reeve
6d76782ee1 Mocks list item remove test 2021-04-11 09:00:44 -07:00
Mouse Reeve
2f1b34d04b
Merge pull request #924 from arkhi/patch-2
Use URL on Mastodon profiles in list of instances
2021-04-11 06:44:33 -07:00
Fabien Basmaison
fc0992ea7c
Use URL on Mastodon profiles in list of instances.
The links to the Mastodon profiles currently default to `mailto:` when parsed by Markdown.
2021-04-11 14:41:14 +02:00