Commit graph

590 commits

Author SHA1 Message Date
c87a009b37 Altering lemmy pict-rs-v2 forwarding. 2020-10-14 11:48:10 -05:00
4010a944a4 Bump pict-rs version 2020-10-11 13:57:35 -05:00
863a662ec6 Stable release 2020-10-10 20:54:15 -05:00
08588c873a pict-rs v2 2020-10-10 19:31:56 -05:00
97fc51b0cd Version v0.7.64 2020-10-08 18:34:30 -05:00
875b0e6f01 Version v0.7.63 2020-10-08 17:50:51 -05:00
03b1821586 Version v0.7.62 2020-10-08 15:52:10 -05:00
c08d891742 Merge branch 'main' into no_conflict_triggers 2020-10-07 20:57:29 -05:00
fd257a6d39 Adding no conflict triggers. Fixes #1179 2020-10-07 19:05:46 -05:00
984f1ae7fb Merge remote-tracking branch 'yerba/main' into main 2020-10-05 11:52:04 -05:00
5a56c08c91 Update lemmy-ui version in docker-compose files on release (fixes #1164) 2020-10-05 17:36:53 +02:00
9b69c446e2 Remove kubernetes. #842 2020-10-04 15:44:26 -05:00
2ad137c280 Merge branch 'remove-hardcoded-https-dess' into main 2020-10-01 12:56:04 -05:00
61f013e4cb Trying to fix travis build. 2020-10-01 09:16:56 -05:00
ada82582ef Version v0.7.61 2020-09-25 16:26:19 -05:00
927ab1f040 Remove hardcoded usage of https (fixes #1126) 2020-09-25 17:33:00 +02:00
nutomic
442369a041 Move websocket code into workspace (#107)
Adjust dockerfiles, fix cargo.toml and remove unused deps

Merge branch 'main' into move-websocket-to-workspace

Move api code into workspace

Move apub to separate workspace

Move websocket code into separate workspace

Some code cleanup

Remove websocket dependency on API

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/107
2020-09-24 13:53:21 +00:00
nutomic
e8ea0664ef Fix nginx config for local federation setup (#104)
Fix depends_on

Add note about different port for backend in federation docs

Fix nginx config for local federation setup

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/104
2020-09-24 13:50:38 +00:00
b99b62a211 Version v0.7.59 2020-09-23 08:58:30 -05:00
1dcf14289d Removing weblate translations from deploy. 2020-09-23 08:56:32 -05:00
2bee3ac33b Fix nginx docs, fix test deploy. 2020-09-22 11:28:16 -05:00
aece5e67b7 Address review comments 2020-09-21 17:24:42 +02:00
12af0f462f Update federation docs 2020-09-21 14:02:40 +02:00
98c086abb9 Move websocket structs into lemmy_structs (ref #1115) 2020-09-16 13:45:31 +02:00
Dessalines
5c6258390c
Isomorphic docker (#1124)
* Adding a way to GetComments for a community given its name only.

* Adding getcomments to api docs.

* A first pass at locally working isomorphic integration.

* Testing out cargo-husky.

* Testing a fail hook.

* Revert "Testing a fail hook."

This reverts commit 0941cf1736.

* Moving server to top level, now that UI is gone.

* Running cargo fmt using old way.

* Adding nginx, fixing up docker-compose files, fixing docs.

* Trying to re-add API tests.

* Fixing prod dockerfile.

* Redoing nightly fmt

* Trying to fix private message api test.

* Adding CommunityJoin, PostJoin instead of joins from GetComments, etc.

- Fixes #1122

* Fixing fmt.

* Fixing up docs.

* Removing translations.

* Adding apps / clients to readme.

* Fixing main image.

* Using new lemmy-isomorphic-ui with better javascript disabled.

* Try to fix image uploads in federation test

* Revert "Try to fix image uploads in federation test"

This reverts commit a2ddf2a90b.

* Fix post url federation

* Adding some more tests, some still broken.

* Don't need gitattributes anymore.

* Update local federation test setup

* Fixing tests.

* Fixing travis build.

* Fixing travis build, again.

* Changing lemmy-isomorphic-ui to lemmy-ui

* Error in travis build again.

Co-authored-by: Felix Ableitner <me@nutomic.com>
2020-09-15 15:26:47 -04:00
af364e7fe0 Version v0.7.57 2020-09-03 09:40:59 -05:00
3a6982e7b2 Adding rate_limiter and api_structs. 2020-09-02 18:17:35 -05:00
8015f560d6 Adding in a more reliable docker dev build. (The other wouldn't use buildkit). 2020-09-02 15:41:49 -05:00
e3140235de Use romacs cargo-build-deps tool. 2020-09-02 10:42:48 -05:00
dc1bc741b4 Fixing docker caching. 2020-08-31 16:47:31 -05:00
34e539cdc0 Updating dev docker-compose. 2020-08-31 13:39:01 -05:00
147972273a Simplify docker federation setup 2020-08-31 17:32:21 +02:00
18002bc837 Version v0.7.56 2020-08-29 17:21:40 -04:00
4819bd5608 Version v0.7.55 2020-08-27 10:38:29 -04:00
Dessalines
dbf231865d
Adding a few more apub tests. (#1096)
* Adding a few more apub tests.

* Fixing travis build, adding a get_post function.
2020-08-20 12:44:22 +00:00
e007006daf Version v0.7.54 2020-08-18 09:43:45 -04:00
82faea7f85 Version v0.7.53 2020-08-17 16:53:50 -04:00
725e46da4a Version v0.7.52 2020-08-16 11:31:09 -04:00
abadc79756 Fix community_view clippy 2020-08-16 11:27:50 -04:00
dd0418af18 Version v0.7.50 2020-08-14 16:00:27 -04:00
49892690ff Version v0.7.49 2020-08-11 10:58:40 -04:00
c1f48d6a0e In federation test setup, run yarn build by default 2020-08-11 14:12:05 +02:00
0acd0bba3a Version v0.7.48 2020-08-10 11:41:18 -04:00
5e9ffde0b1 Version v0.7.47 2020-08-07 23:22:35 -04:00
71a0dd4cc9 Version v0.7.46 2020-08-07 23:21:05 -04:00
992b3ca95b Some UI fixes. 2020-08-07 23:17:37 -04:00
ce8622b9cd Version v0.7.43 2020-08-06 21:22:15 -04:00
3e5d5abd53 Version v0.7.42 2020-08-06 17:37:08 -04:00
e645386842 Version v0.7.41 2020-08-05 13:55:14 -04:00
88bd368660 Version v0.7.40 2020-08-05 12:41:40 -04:00
nutomic
c34fffc2c4 Proxy pictrs requests through Lemmy (fixes #371) (#77)
fix check_only value for image rate limit

Fix image rate limit

Add rate limit for image uploads

Proxy pictrs requests through Lemmy (fixes #371)

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/77
2020-08-05 16:00:00 +00:00
Dessalines
e9e1497830
Add bio federation. (#1052)
* Re-organizing federation tests. #746 #1040

* Adding federation support for user bios. Fixes #992
2020-08-04 11:06:27 -04:00
Dessalines
e336e5bcc0
Re-organizing federation tests. #746 #1040 (#1047)
* Re-organizing federation tests. #746 #1040

* Add more checks in inbox, plus some refactoring (#76)

Merge branch 'main' into more-inbox-permissions

Move check_community_ban() into helper function

Move slur check into helper functions

Move Claims::decode and site ban check into helper function

Note: this changes behaviour in that site ban is checked in more
places now. we could easily add a boolean parameter
check_for_site_ban to get the previous behaviour back

Rewrite user_inbox and community_inbox in the same way as shared_inbox

Add check against instance allowlist etc in shared_inbox

Co-authored-by: dessalines <dessalines@noreply.yerbamate.dev>
Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/76

* Adding verbose to test results.

Co-authored-by: nutomic <nutomic@noreply.yerbamate.dev>
Co-authored-by: dessalines <dessalines@noreply.yerbamate.dev>
Co-authored-by: Felix Ableitner <me@nutomic.com>
2020-08-04 10:57:37 -04:00
ce874e183b Version v0.7.39 2020-08-02 10:52:42 -04:00
5b23595710 Version v0.7.38 2020-08-01 23:53:32 -04:00
dee5c302a8 Version v0.7.37 2020-08-01 20:04:14 -04:00
alltheseteeth
4acd3c5bd2
added trailing slash fix to every nginx conf I could find (#1046) 2020-08-01 19:33:39 -04:00
1a0f70450c Version v0.7.36 2020-08-01 19:17:53 -04:00
dc4ac6345c Version v0.7.35 2020-07-29 22:36:27 -04:00
25e61b276a Version v0.7.34 2020-07-29 22:30:38 -04:00
04cb1e0161 Version v0.7.33 2020-07-29 09:06:26 -04:00
Dessalines
49bd28e2d4
Adding visual captchas for register and login. (#1027)
* Adding visual captchas for register and login.

* Adding audio wav file for Captcha using espeak.

* Lots of captcha fixes.

- Removed login captchas.
- Added settings to disable captchas, and change difficulty.
- Captchas can only be checked / used once, front end gives a new one on
  failure.
- Added front end button for regenerating captcha.
- Added a disabled / pause button audio playing.

* Some more fixes.
2020-07-29 09:02:46 -04:00
5dd0efb280 Version v0.7.32 2020-07-29 00:29:56 -04:00
52b221e3c9 Version v0.7.31 2020-07-28 21:20:19 -04:00
617d636432 Version v0.7.30 2020-07-25 10:43:42 -04:00
0ff9af5ba5 Version v0.7.29 2020-07-24 22:06:16 -04:00
Dessalines
edb2e40383
Automated travis docker testing and deploys. (#1023)
* Testing out a travis 1.

* Testing out a travis 2.

* Testing out a travis 3.

* Testing out a travis 4.

* Testing out a travis 5.

* Testing out a travis 6. Trying a failing test

* Testing out a travis 7. Trying to cache the docker images.

* Testing out a travis 8. Still not correctly failing.

* Trying full path for docker_images dir.

* Fixing test again, trying a dockerhub deploy.

* Fixing test again, trying a dockerhub deploy 2.

* Remove caching.

* Trying to fix docker deploy.

* Try using the travis tag

* Using dessalines/lemmy:travis

* Try using the prod dockerfile now.

* Update http sigs dependency

* Finally getting this mostly working.

Co-authored-by: asonix <asonix@asonix.dog>
2020-07-24 22:06:00 -04:00
edfd10262f Version v0.7.28 2020-07-23 09:48:39 -04:00
db0d213710 Version v0.7.26 2020-07-22 09:56:15 -04:00
Dessalines
55ce7b1339
Adding version to GetSite. Fixes #1001 (#1002)
* Adding version to GetSite. Fixes #1001

* Removing version.ts file
2020-07-21 13:20:23 +00:00
3342a6a910 Version v0.7.25 2020-07-17 18:54:34 -04:00
2a206e1b4d Version v0.7.24 2020-07-16 21:17:34 -04:00
c4d54fc427 Updating deploy to use weblate/main 2020-07-16 21:16:32 -04:00
1e30fcf235 Version v0.7.23 2020-07-16 21:13:18 -04:00
f69f044aaa Version v0.7.22 2020-07-15 10:16:31 -04:00
2f5e191b2d Changing references from master to main. #820 2020-07-14 13:30:36 -04:00
70f15ffd6f Version v0.7.21 2020-07-14 12:12:13 -04:00
5ccf81349e Version v0.7.20 2020-07-14 09:17:36 -04:00
52983907c4 Version v0.7.19 2020-07-13 15:21:16 -04:00
abe7a41f58 Version v0.7.18 2020-07-13 13:32:01 -04:00
Dessalines
22a33929e2
Adding docker workspace caching. Fixes #940 (#958) 2020-07-13 12:31:06 -04:00
f0357bc988 Version v0.7.17 2020-07-12 16:16:43 -04:00
d63eb7c8f5 Version v0.7.16 2020-07-11 10:14:04 -04:00
cb77339370 Version v0.7.15 2020-07-10 21:38:24 -04:00
nutomic
80aef61aed Split code into cargo workspaces (#67)
More fixes

- fixed docker builds
- fixed mentions regex test
- fixed DATABASE_URL stuff
- change schema path in diesel.toml

Address review comments

- add jsonb column back into activity table
- remove authors field from cargo.toml
- adjust LEMMY_DATABASE_URL env var usage
- rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL

Decouple utils and db

Split code into cargo workspaces

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
2020-07-10 18:15:41 +00:00
debbd316c2 Version v0.7.14 2020-07-09 20:16:39 -04:00
d720993141 Merge branch 'master' into migrate-apub-lib 2020-07-08 12:13:17 -04:00
c9338027f2 Migrate user and group to new activitystreams library 2020-07-08 18:01:04 +02:00
cd5f500d11 Version v0.7.13 2020-07-08 09:14:25 -04:00
8fda7d00d5 Version v0.7.12 2020-07-07 11:07:51 -04:00
ce8e22ae3b
Improve import script UI, errors (#887)
* Improve import script UI, errors

* Fix jq check

* Add space between ! and which
2020-07-05 16:01:21 -04:00
6780855b1f Version v0.7.11 2020-07-04 11:37:04 -04:00
bca62cbf0f Version v0.7.10 2020-07-04 07:42:29 -04:00
e95992b704 Version v0.7.9 2020-07-03 22:26:49 -04:00
Dessalines
284f00249a
Going back from jolt to dogbin iframely. jolt one had problems. (#900) 2020-07-03 18:19:24 +00:00
9e1e12f6ce Version v0.7.8 2020-07-01 21:54:36 -04:00
8d49dc958e Version v0.7.7 2020-07-01 20:39:51 -04:00
cd007febef Merge branch 'master' into federation 2020-07-01 09:04:26 -04:00
a074564458
Federation async (#848)
* Asyncify more

* I guess these changed

* Clean PR a bit

* Convert more away from failure error

* config changes for testing federation

* It was DNS

So actix-web's client relies on TRust DNS Resolver to figure out
where to send data, but TRust DNS Resolver seems to not play nice
with docker, which expressed itself as not resolving the name to
an IP address _the first time_ when making a request. The fix was
literally to make the request again (which I limited to 3 times
total, and not exceeding the request timeout in total)

* Only retry for connecterror

Since TRust DNS Resolver was causing ConnectError::Timeout,
this change limits the retry to only this error, returning
immediately for any other error

* Use http sig norm 0.4.0-alpha for actix-web 3.0 support

* Blocking function, retry http requests

* cargo +nightly fmt

* Only create one pictrs dir

* Don't yarn build

* cargo +nightly fmt
2020-07-01 08:54:29 -04:00
5c03e9e9ee Version v0.7.6 2020-07-01 08:25:55 -04:00
Dessalines
c0b11d4fa3
Replacing dogbin/iframely docker image with jolt one. (#869)
* Replacing dogbin/iframely docker image with jolt one.

* Replacing dogbin/iframely docker image with jolt one.
2020-06-30 11:11:36 +00:00
eded51aab6 Version v0.7.5 2020-06-29 21:05:38 -04:00
15ea264fcf Version v0.7.4 2020-06-29 21:02:02 -04:00
c10a05cb68 Version v0.7.3 2020-06-29 20:14:16 -04:00
0112d0d955 Fixing test deploy, adding a rate limiter to ansible nginx config. 2020-06-28 13:44:42 -04:00
4c1cb5999c Fixing some scripts for the federation-test 2020-06-27 14:54:42 -04:00
e517de5480 Merge branch 'master' into federation 2020-06-27 10:54:08 -04:00
bd3051e058 Merge branch 'master' into improve-config 2020-06-27 10:09:16 -04:00
b6fc1959e6 Merge branch 'improve-config' of https://yerbamate.dev/LemmyNet/lemmy into improve-config 2020-06-27 10:08:09 -04:00
da2bb724e9 Version v0.7.2 2020-06-27 09:28:28 -04:00
86dc50f9f0 Some fixes to federation.
- Advanced code migrations now disable then re-enable triggers.
  Brings run time down to < 15 seconds, no need to thread them.
- Changing ap_ids and actor_ids in migrations to a fake url,
  so it doesn't break XsdAnyUri in activitystreams.
2020-06-26 21:12:41 -04:00
0c89de8065 Fix previous comment, also fix link in docs 2020-06-26 19:16:41 +02:00
3928556033 Merge branch 'master' into improve-config 2020-06-25 16:16:16 -04:00
6e736e1f1e Version v0.7.1 2020-06-24 13:29:44 -04:00
a9d98fd09b Improve config files by adding documentation and removing some fields 2020-06-24 16:09:52 +02:00
dc94e58cbf Merge branch 'master' into federation_merge_from_master_2 2020-06-23 21:11:38 -04:00
0680dd2398 Version v0.7.0 2020-06-23 12:55:16 -04:00
27f2fd352a Version v0.6.85 2020-06-22 23:04:28 -04:00
5d1212b83c Version v0.6.84 2020-06-22 22:43:57 -04:00
11f771469f Version v0.6.83 2020-06-22 22:01:45 -04:00
e3484de3b8 Merge branch 'master' into iav-arm-musl-dessalines 2020-06-22 20:35:09 -04:00
54c735841e Version v0.6.82 2020-06-22 19:32:30 -04:00
c9dcb2662c Version v0.6.81 2020-06-22 17:53:47 -04:00
234be6fb09 Changing to prod_lemmy:latest 2020-06-22 17:52:39 -04:00
32d1f42626 Version v0.6.80 2020-06-22 16:15:31 -04:00
1b38e33bd3 Fixing deploy script. 2020-06-22 16:13:02 -04:00
132e3534de Removing some commented lines from the dockerfile. 2020-06-22 15:12:37 -04:00
983a45e178 Merge branch 'master' into iav-arm-musl-dessalines 2020-06-22 14:57:55 -04:00
cbed185040 Version v0.6.79 2020-06-22 12:56:48 -04:00
186e261fc0 Fixing docker-compose to rely on pictrs 2020-06-22 12:53:39 -04:00
1fa7d17e35 Version v0.6.78 2020-06-22 12:51:18 -04:00
b161cad982 Fixing up the migration script some more. 2020-06-22 12:43:09 -04:00
4332828dd7 Fixing some things in the pictrs upgrade script. 2020-06-22 12:04:28 -04:00
5872658f8c Checking for imagemagick install. 2020-06-22 10:54:33 -04:00
cb128256ed Updating nginx.conf, upgrading pict-rs 2020-06-22 08:31:15 -04:00
ceb1284f27 Fixing deploy.sh 2020-06-17 22:32:18 -04:00
207caeda5b Version v0.6.77 2020-06-17 22:20:30 -04:00
294acfe412 Version v0.6.76 2020-06-17 22:18:47 -04:00
0782377ae3 Version v0.6.75 2020-06-17 22:11:48 -04:00
68bcc26ff6 Fix community description federation (ref #647)
Also disable the actor refetch interval in debug builds.
2020-06-16 13:35:26 +02:00
325ed2ec3b Rename "instance_whitelist" config option to "allowed_instances" 2020-06-16 12:49:51 +02:00
9f50432999 wip: Add migration script from pictshare to pictrs 2020-06-15 19:46:57 +02:00
bda657b638 Some reorg of Dockerfiles. 2020-06-14 16:36:18 -04:00
Igor Velkov
6f58be9493 dockerfile for x64 and arm building with musl 2020-06-14 01:28:50 +03:00
5594bed6a8 Merge branch 'master' into use-pictrs-1 2020-06-12 17:51:37 -04:00
f647f2ae6c Blocking pict-rs import location 2020-06-12 17:05:19 -04:00
7cb7c1f0f9 Adding lld to docker builds. #810 2020-06-12 16:17:01 -04:00
4ea6c4ad5d Various build optimizations 2020-06-12 21:45:23 +02:00
cddc23494d Upgrading pict-rs for working gifs. 2020-06-12 09:48:51 -04:00
1b0212377d Version v0.6.74 2020-06-11 10:28:21 -04:00
4cf1f080bf Adding delete picture via pict-rs delete tokens. Fixes #505 2020-06-10 22:47:06 -04:00
043f484693 Version v0.6.73 2020-06-10 11:27:12 -04:00
46bb3064ed Version v0.6.72 2020-06-09 22:49:42 -04:00
bd26e4e9c1 Fixing some front end pictshare to pictrs conversions. 2020-06-09 17:17:24 -04:00
0f1a8ec928 Merge branch 'master' into federation 2020-06-09 14:01:26 +02:00
e583e45d9a Use pictrs instead of pictshare 2020-06-08 19:52:32 +02:00
fe56da1654 Merge remote-tracking branch 'yerba/limit-memory' 2020-06-05 13:05:14 -04:00
63ca6e1e24 Version v0.6.71 2020-06-05 11:49:36 -04:00
8257b040be Limit memory usage for pictshare and iframely 2020-06-05 17:07:38 +02:00
7c0ea6cfa7 Version v0.6.70 2020-06-04 21:42:08 -04:00
f40f74b20d Adding additional 3-instance integration test for community announce. 2020-06-03 17:55:32 -04:00
2e882f75f2 Version v0.6.69 2020-06-03 12:11:52 -04:00
361cf995da Version v0.6.68 2020-06-03 11:46:09 -04:00
59d22ef775 Version v0.6.67 2020-06-02 19:59:49 -04:00
1e88b815da Updating pictshare docker image. 2020-06-02 19:29:29 -04:00
998b9454b2 Version v0.6.66 2020-06-02 14:05:17 -04:00
847e19f22d Version v0.6.65 2020-05-28 14:13:47 -04:00
ce0a37cdf1 get it working (mostly) 2020-05-28 13:51:48 +02:00
5753c4feaa Let community announce posts 2020-05-28 13:15:51 +02:00
Dessalines
80653a5317
Remove federation option from master. (#745) 2020-05-25 18:48:24 -04:00
e54eac6227 Adding use_tls to lemmy.hjson for email config. 2020-05-24 18:31:17 -04:00
4f518a5d92 Version v0.6.64 2020-05-24 13:25:50 -04:00
18d0edd4eb Version v0.6.63 2020-05-18 09:53:02 -04:00
106ce6096b Version v0.6.62 2020-05-17 18:46:15 -04:00
f5e96d9372 Version v0.6.61 2020-05-17 16:53:56 -04:00
155b99b64e Version v0.6.60 2020-05-12 15:27:28 -04:00
c22310bdaf Version v0.6.59 2020-05-11 19:08:28 -04:00
cb88510964 Version v0.6.58 2020-05-11 14:04:23 -04:00
b83aae0b57 Version v0.6.57 2020-05-08 14:08:35 -04:00
88e1251d6b Version v0.6.56 2020-05-03 17:27:25 -04:00
22abbebd41 Lots of additions to federation.
- Added a shared inbox.
- Added federated comments, comment updates, and tests.
- Abstracted ap object sends into a common trait.
2020-04-27 12:57:00 -04:00
66134823bf Version v0.6.55 2020-04-27 09:07:31 -04:00
92e4edf9b7 Version v0.6.54 2020-04-26 10:57:27 -04:00
df9135f410 Removing run-tests TODO. 2020-04-24 22:02:12 -04:00
c3ac1649f2 Implement integration test for federation 2020-04-24 18:30:31 +02:00
c22090c602 Version v0.6.53 2020-04-22 00:30:43 -04:00
b2a89cd217 Version v0.6.52 2020-04-21 20:43:38 -04:00
4e80543edb Update test_deploy.sh, supporting different branches 2020-04-21 19:19:10 +02:00
f0026065f5 Merge branch 'master' into federation_merge_from_master_1 2020-04-21 10:25:29 -04:00
b98fa12741 Version v0.6.51 2020-04-20 15:40:56 -04:00
0199b5f169 Use debug logging 2020-04-18 17:24:55 +02:00
b1b97db11a Implement instance whitelist 2020-04-17 19:34:18 +02:00
9c974fbe50 Remove instance follows 2020-04-17 16:39:03 +02:00
86f172076b Implement search for activitypub IDs 2020-04-17 15:46:08 +02:00
9a85f1b25f Send activities to correct inbox, seperate community/user inboxes 2020-04-15 20:12:25 +02:00
be6a7876b4 Version v0.6.50 2020-04-14 19:38:20 -04:00
1336b4ed60 Merge branch 'dev' into federation 2020-04-14 16:07:20 -04:00
9d2046d5a2 Disable nginx access logs for docker/federation/ 2020-04-14 17:47:55 +02:00
6d5518cbd4 Merge branch 'dev' into admin_settings 2020-04-14 10:54:04 -04:00
b9aef5891f Fixing test deploy. 2020-04-14 10:07:40 -04:00