Commit Graph

4179 Commits

Author SHA1 Message Date
Alex S
af12d08da7 no need in this 2019-08-20 12:42:53 +03:00
Alex S
3bc3e61dc5 some clean up and pleroma header 2019-08-20 12:42:53 +03:00
Alex S
05ca6a7d2c test fixes 2019-08-20 12:42:53 +03:00
Alex S
814159e668 expanding gun connections
closing least frequently used
separate pools with settings
2019-08-20 12:42:53 +03:00
Alex S
210e116dc0 no hardcode of versions 2019-08-20 12:41:46 +03:00
Alex S
699fc4f6eb order 2019-08-20 12:41:46 +03:00
Alex S
102ec7bb0c like thiis 2019-08-20 12:41:46 +03:00
Alex S
4a4a61f4ce like this 2019-08-20 12:41:45 +03:00
Alex S
6e1408d05a tls versions for gun 2019-08-20 12:41:45 +03:00
Alex S
fb0d064328 more fixes 2019-08-20 12:41:45 +03:00
Alex S
ac0d158c24 test fixes 2019-08-20 12:41:45 +03:00
Alex S
c97979da77 passing options for gun 2019-08-20 12:41:45 +03:00
Alex S
7354d8958b debug for media proxy 2019-08-20 12:41:45 +03:00
Alex S
d052dca152 fix 2019-08-20 12:41:45 +03:00
Alex S
7f431996c5 updated deps 2019-08-20 12:41:45 +03:00
Alex S
66a1573f81 updating tesla 2019-08-20 12:41:45 +03:00
Alex S
916aeb934f adding host header for gun adapter 2019-08-20 12:41:45 +03:00
Alex S
55a5523acc don't close connection in gun adapter on reusing 2019-08-20 12:41:10 +03:00
Alex S
e0b52ca086 only http 2019-08-20 12:41:10 +03:00
Alex S
43e5307d65 like this 2019-08-20 12:41:10 +03:00
Alex S
d28051e284 another debug 2019-08-20 12:41:10 +03:00
Alex S
db848b2a13 tesla adapter options debug 2019-08-20 12:41:10 +03:00
Alex S
888ac63df4 some debug 2019-08-20 12:41:10 +03:00
Alex S
c0916b66f8 removing debug 2019-08-20 12:41:10 +03:00
Alex S
27d5aa7546 ssl fixes 2019-08-20 12:41:10 +03:00
Alex S
9241df642c some debug 2019-08-20 12:41:10 +03:00
Alex S
aee44f3f4b added gun connections holder genserver 2019-08-20 12:41:10 +03:00
Alex S
2caf9ad954 added gun connections genserver 2019-08-20 12:39:53 +03:00
Alex S
c51aa48e60 reverse proxy clients integration tests
tesla reverse proxy client fixes
2019-08-20 12:39:53 +03:00
Alex S
02daf21d78 possibility to set tesla adapter in runtime 2019-08-20 12:39:53 +03:00
Alex S
80ddc24281 fix 2019-08-20 12:39:53 +03:00
Alex S
4e9d9209c3 added tesla client for reverse proxy 2019-08-20 12:39:53 +03:00
Alex S
b383d85b9b headers standardisation for tesla 2019-08-20 12:37:48 +03:00
Alex S
b233875ef5 namings 2019-08-20 12:37:47 +03:00
lain
d2c9befc64 Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
#   CHANGELOG.md
2019-08-19 17:00:59 +00:00
Sergey Suprunenko
75a5dd41ee Add more tests for Database tasks and DigestEmailWorker 2019-08-19 16:10:00 +00:00
lain
49ae3191df Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user

See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
Maksim Pechnikov
e652cef76b removes duplicates from relay subscription list 2019-08-19 13:39:18 +03:00
kaniini
475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583
2019-08-18 21:59:22 +00:00
kaniini
18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
Sadposter
94e336d9d5 clear follow requests when blocking a user 2019-08-18 20:30:57 +01:00
Mark Felder
ef82f868d9 Formatting 2019-08-16 10:00:18 -05:00
Maksim Pechnikov
3315a2a1c3 fixed User.unfollow with synchronization external user 2019-08-16 15:58:42 +03:00
lain
7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations

See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
Mark Felder
6a3b1a526e max_body_size -> max_body_length, as it should be 2019-08-15 15:34:41 -05:00
rinpatch
fba3c16d20 Fix OAuth cleanup worker unconditionally starting
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
2019-08-15 20:36:20 +03:00
kaniini
1c8f58a30e Merge branch 'features/formatting-sub_sup' into 'develop'
html.ex: Allow sub and sup elements by default

Closes #1191

See merge request pleroma/pleroma!1572
2019-08-15 17:34:16 +00:00
rinpatch
1ad71592ad Parallelize template rendering 2019-08-15 18:05:50 +03:00
rinpatch
a4a3e3becd Hide muted theads from home/public timelines unless with_muted is set 2019-08-15 17:37:30 +03:00
lain
9fb71ce7f4 Merge branch 'cache-follow-state' into 'develop'
Cache follow state

Closes #1180

See merge request pleroma/pleroma!1573
2019-08-15 14:06:27 +00:00