Commit graph

3500 commits

Author SHA1 Message Date
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
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
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
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
d2bea09a60 Dont send email notifications to banned users (fixes #1251) 2020-11-05 13:43:46 +01:00
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
eab9123b86 Merge branch 'main' of https://github.com/lemmynet/lemmy into main 2020-11-01 21:26:36 -06:00
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
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
9e24eda752 In comment create/update, include parent creator in cc (ref #698) 2020-10-27 16:57:44 +01:00
77b17c6737 Fixing cache dev dockerfile 2020-10-27 10:57:40 -05:00
91d073c2e8 Use docker cache for docker/dev/ 2020-10-27 13:58:52 +01:00
4c0c558945 Merge branch 'main' of https://github.com/lemmynet/lemmy into main 2020-10-26 19:18:28 -05:00
5b871d3dd8 Merge branch 'prod_dockerfile_update' into main 2020-10-26 19:16:33 -05:00
2e922d602d Trying a target fix. 2020-10-26 17:32:50 -05:00
3100e8bf21 Trying a target fix. 2020-10-26 15:50:37 -05:00
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
ba0680f5e6 Simplifying prod build, using musl stable. 2020-10-26 12:18:47 -05:00
6eab24270b Merge remote-tracking branch 'yerba/main' into main 2020-10-26 10:34:40 -05:00
dessalines
53c9094d46 Merge pull request 'Limit amount of HTTP requests to handle activities (fixes #1221)' (#117) from request-limit into main
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/117
2020-10-26 15:35:39 +00:00
dessalines
60bc62932b Merge pull request 'docker/lemmy.hjson is missing field email.use_tls (fixes #1231)' (#120) from lemmy-config-use-tls into main
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/120
2020-10-26 13:49:05 +00:00
99abc49040 Add /activities endpoint (ref #1220) 2020-10-26 12:54:27 +01:00
Dessalines
6337762ec7
Adding image endpoints to docs. Fixes #1226 (#1232) 2020-10-26 11:07:23 +00:00
c33918c71f docker/lemmy.hjson is missing field email.use_tls (fixes #1231) 2020-10-26 11:28:32 +01:00
4f0059198e Updating readme to ref join.lemmy.ml 2020-10-25 10:34:22 -05:00
134d66924e Version v0.8.1 2020-10-24 15:15:48 -05:00
295c209c67 Updating lemmy.hjson config. 2020-10-24 15:14:58 -05:00
5e0562e80e Fix matrix room link. 2020-10-24 15:10:22 -05:00
Dessalines
ad1ba85eb9
Merge pull request #1229 from IronOxidizer/fix-docker-dev
Removed docker root prefix, add pictrs dir
2020-10-23 14:04:30 -04:00
Iron Oxidizer
ac79496036 Removed docker root prefix, add pictrs dir 2020-10-23 13:14:30 -04:00
6d17d5ead2 Ignore incoming activities which have been received before (ref #1220) 2020-10-23 14:29:56 +02:00
Dessalines
cfa60dcb76
Merge pull request #1225 from LemmyNet/fix_remove_icons
Fix invalid url error when removing icons. Fixes #1219
2020-10-22 14:56:55 -04:00