mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 18:01:00 +00:00
Code Issues Projects Releases Wiki Activity
2915 commits 1064 branches 559 tags 66 MiB
Commit graph

2915 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dessalines
08b8e9999b Merge remote-tracking branch 'yerba/main' into main 2020-11-11 13:18:42 -06:00
dessalines
15c77f85c1 Merge pull request 'Add pending status for federated follows' (#130) from pending-follow into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/130
 2020-11-11 19:18:27 +00:00
Felix Ableitner
fb16f47f2f Add user_inbox check that activities are really addressed to local users 2020-11-11 17:40:45 +01:00
Felix Ableitner
964d95de5c Fix unit tests 2020-11-11 17:28:30 +01:00
Dessalines
64ac4e382a Version v0.8.3 2020-11-11 07:57:33 -06:00
Dessalines
4a61758bde
Merge pull request #1261 from LemmyNet/more-tests-2 
Adding some more integration tests for locked posts and bans.
 2020-11-10 13:39:01 -05:00
Dessalines
ff8acfb8de Adding some more integration tests for locked posts and bans. 2020-11-10 10:53:35 -06:00
Felix Ableitner
06e82fe761 Add pending status for federated follows 2020-11-10 16:45:10 +01:00
dessalines
94dd335fac Merge pull request 'Enforce post lock in federation inbox' (#129) from enforce-post-lock into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/129
 2020-11-10 13:16:13 +00:00
dessalines
437809d337 Merge pull request 'Separate logic for user and community inbox' (#123) from rewrite-inbox into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/123
 2020-11-10 13:14:40 +00:00
Felix Ableitner
e1fd614dd1 Fixed bug where comments with mentions were treated as private message 2020-11-09 19:18:23 +01:00
Felix Ableitner
3b4c3ec074 Enforce post lock in federation inbox 2020-11-09 17:06:54 +01:00
Felix Ableitner
8803e7834f Enforce site and community bans for federated users 2020-11-09 15:29:36 +01:00
Felix Ableitner
b469b6d8d3 Separate logic for user and community inbox 
more refactoring with tons of changes:

- inbox functions return LemmyError instead of HttpResponse
- announce is done directly in community inbox
- reorganized functions for handling inbox activities
- additional checks for private messages
- moved inbox handler functions for post, comment, vote into separete file
- ensure that posts, comments etc are addressed to public (ref #1220)
- probably more
 2020-11-09 13:42:08 +01:00
Dessalines
7e13970a4f Version v0.8.2 2020-11-06 07:06:50 -06:00
nutomic
7c51a36012 In activity table, remove user_id and add sensitive (#127) 
Forgot to add migrations

Add `sensitive` column to activities table, so PMs arent served over HTTP

Remove user_id column from actvity table

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/127
 2020-11-06 13:06:47 +00:00
Dessalines
405eb15291 Merge remote-tracking branch 'yerba/main' into main 2020-11-06 07:05:22 -06:00
nutomic
b7d2dac9bf Fix federation of community removal/deletion, added docs (#125) 
Adding a federation test for community deletes / removes.

Add missing docs for community deletion/removal (fixes #1250)

Fix federation of community deletion/removal (fixes #1253)

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/125
 2020-11-05 20:19:06 +00:00
Dessalines
76193d37da Merge remote-tracking branch 'yerba/main' into main 2020-11-05 14:17:35 -06:00
dessalines
60517f8471 Merge pull request 'Dont send email notifications to banned users (fixes #1251)' (#126) from dont-email-banned-user into main 
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/126
 2020-11-05 19:14:49 +00:00
Felix Ableitner
c6c74ab1e3 Also check for ban when sending private message notification 2020-11-05 16:13:01 +01:00
Dessalines
9aa700fb10
Merge pull request #1252 from LemmyNet/yerbamate-change-tld 
Change domain of yerbamate.dev to yerbamate.ml
 2020-11-05 08:41:12 -05:00
Felix Ableitner
d2bea09a60 Dont send email notifications to banned users (fixes #1251) 2020-11-05 13:43:46 +01:00
Felix Ableitner
45dced3fcb Change domain of yerbamate.dev to yerbamate.ml 2020-11-03 22:50:59 +01:00
Dessalines
5e2a5c0266
Upgrading pictrs to v0.2.5 (#1249) 2020-11-02 18:12:21 +00:00
Dessalines
18d9811de7
Merge pull request #1246 from knkski/pictrs-url-variable 
Fix hardcoded pictrs URL reference
 2020-11-01 22:45:03 -05:00
Dessalines
cca0b4c0f9
Merge pull request #1247 from knkski/iframely-url-setting 
Add iframely_url setting
 2020-11-01 22:44:28 -05:00
Dessalines
eab9123b86 Merge branch 'main' of https://github.com/lemmynet/lemmy into main 2020-11-01 21:26:36 -06:00
Dessalines
0ea4095238 Changing docs formattin, running format. 2020-11-01 21:26:00 -06:00
Kenneth Koski
b3035e21ef
Parameterize docs directory (#1245) 
Adds `docs_dir` setting for configurable documentation location
 2020-11-01 22:21:15 -05:00
Kenneth Koski
3d872b03e3
Add iframely_url setting 2020-10-31 17:08:03 -05:00
Kenneth Koski
1ae335e058
Fix hardcoded pictrs URL reference 
Reads the URL from Settings instead
 2020-10-31 16:52:54 -05:00
Kenneth Koski
09498d8bb3
Update configuration documentation 2020-10-31 16:28:09 -05:00
Kenneth Koski
bfd8f52497
Parameterize config file location 
Allows `config.hjson` to be located on a configurable path.
 2020-10-31 16:25:52 -05:00
eiknat
fc36ae22c9
GetUserDetails doesnt return users own email (#1240) 
* user: GetUserDetails doesnt return users own email

* user: rename get_user to get_user_dangerous, apply suggested changes
 2020-10-30 18:19:47 -04:00
Dessalines
1fd5486def Fixing missing community doc. 2020-10-30 12:46:11 -05:00
Dessalines
7ef044231f
Update cargo deps, upgrading lettre. #789 (#1234) 
* Update cargo deps, upgrading lettre. #789

* Adding a comment

* Adding some better expect messages.

* Fixing lettre email.
 2020-10-30 13:19:00 -04:00
Dessalines
9e5e0eb9b7
Merge pull request #1242 from ShadowJonathan/patch-1 
Update about_features.md
 2020-10-30 11:28:53 -04:00
Jonathan de Jong
d3b07c8131
Update about_features.md 
...in accordance with the readme.
 2020-10-30 09:46:30 +01:00
dessalines
3bf885329d Merge pull request 'Ignore incoming activities which have been received before, add /activities endpoint' (#118) from activity-checks into main 
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/118
 2020-10-27 16:26:16 +00:00
dessalines
e95ca66c9f Merge pull request 'In comment create/update, include parent creator in cc (ref #698)' (#122) from comment-parent-cc into main 
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/122
 2020-10-27 16:15:20 +00:00
Felix Ableitner
9e24eda752 In comment create/update, include parent creator in cc (ref #698) 2020-10-27 16:57:44 +01:00
Dessalines
77b17c6737 Fixing cache dev dockerfile 2020-10-27 10:57:40 -05:00
Felix Ableitner
91d073c2e8 Use docker cache for docker/dev/ 2020-10-27 13:58:52 +01:00
Dessalines
4c0c558945 Merge branch 'main' of https://github.com/lemmynet/lemmy into main 2020-10-26 19:18:28 -05:00
Dessalines
5b871d3dd8 Merge branch 'prod_dockerfile_update' into main 2020-10-26 19:16:33 -05:00
Dessalines
2e922d602d Trying a target fix. 2020-10-26 17:32:50 -05:00
Dessalines
3100e8bf21 Trying a target fix. 2020-10-26 15:50:37 -05:00
Dessalines
b42b461418 Trying a permissions fix. 2020-10-26 13:35:19 -05:00
Dessalines
604d125a55
Simplifying prod build, using musl stable. (#1235) 2020-10-26 17:33:43 +00:00