Commit Graph

6344 Commits

Author SHA1 Message Date
Ariadne Conill
f7eaf9f763 gun connection pool worker: fix up start_link() 2019-08-18 23:15:13 +00:00
Ariadne Conill
967d6732d4 gun: connection: fix up a comment pointed out by credo 2019-08-18 22:42:55 +00:00
Ariadne Conill
2121e82da6 test: gun: fix aliases 2019-08-18 22:34:14 +00:00
Alex S
4a0d82f727 order 2019-08-18 22:34:14 +00:00
Alex S
93a01b3496 like thiis 2019-08-18 22:34:14 +00:00
Alex S
2370394a4e like this 2019-08-18 22:34:14 +00:00
Alex S
a6101f0991 tls versions for gun 2019-08-18 22:34:14 +00:00
Alex S
722f97b347 tesla update 2019-08-18 22:34:14 +00:00
Alex S
5177d589d7 more fixes 2019-08-18 22:34:14 +00:00
Alex S
b11eeb48c4 test fixes 2019-08-18 22:34:14 +00:00
Alex S
806febba60 passing options for gun 2019-08-18 22:34:14 +00:00
Alex S
8e91a77317 debug for media proxy 2019-08-18 22:34:14 +00:00
Alex S
a7c668c4d9 fix 2019-08-18 22:34:14 +00:00
Alex S
f7fea15d55 updated deps 2019-08-18 22:34:14 +00:00
Alex S
d53514d111 updating tesla 2019-08-18 22:34:14 +00:00
Alex S
b5e35dfaa2 receive adapter messages in adapter 2019-08-18 22:34:14 +00:00
Alex S
5aa1b8283d adding host header for gun adapter 2019-08-18 22:34:14 +00:00
Alex S
a577fa3c1a tesla update 2019-08-18 22:34:14 +00:00
Alex S
44e2136191 don't close connection in gun adapter on reusing 2019-08-18 22:34:14 +00:00
Alex S
beab94d689 only http 2019-08-18 22:34:14 +00:00
Alex S
0c68cf4357 like this 2019-08-18 22:34:14 +00:00
Alex S
9f2e2dea65 another debug 2019-08-18 22:34:14 +00:00
Alex S
8b26870809 tesla adapter options debug 2019-08-18 22:34:14 +00:00
Alex S
2ca6d54437 some debug 2019-08-18 22:34:14 +00:00
Alex S
d04da53ad6 removing debug 2019-08-18 22:34:14 +00:00
Alex S
407390eee7 ssl fixes 2019-08-18 22:34:14 +00:00
Alex S
c4dc8a8009 some debug 2019-08-18 22:34:13 +00:00
Alex S
aa0ab31b5b added gun connections holder genserver 2019-08-18 22:34:13 +00:00
Alex S
2469061657 added gun connections genserver 2019-08-18 22:34:13 +00:00
Alex S
26691b1b35 reverse proxy clients integration tests
tesla reverse proxy client fixes
2019-08-18 22:34:13 +00:00
Alex S
b0eefe235f possibility to set tesla adapter in runtime 2019-08-18 22:34:13 +00:00
Alex S
33e7657fcc fix 2019-08-18 22:34:13 +00:00
Alex S
1f6b2a3d43 added tesla client for reverse proxy 2019-08-18 22:34:13 +00:00
Alex S
e7e11d52d3 headers standardisation for tesla 2019-08-18 22:34:13 +00:00
Alex S
33d04c1874 namings 2019-08-18 22:34:13 +00:00
Alex S
ca16ea0540 adding gun adapter 2019-08-18 22:34:13 +00:00
kaniini
608773c5ef Merge branch 'chore/fix-ap-muted-tests' into 'develop'
tests: activitypub: fix muted thread tests

See merge request pleroma/pleroma!1584
2019-08-18 22:33:51 +00:00
Ariadne Conill
a2fdc32368 tests: activitypub: fix typo 2019-08-18 22:31:59 +00: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
58c1391c4d use commonAPI in tests 2019-08-18 22:54:40 +01:00
Sadposter
94e336d9d5 clear follow requests when blocking a user 2019-08-18 20:30:57 +01: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
rinpatch
0f24edcd8d Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
Fix OAuth cleanup worker unconditionally starting

See merge request pleroma/pleroma!1578
2019-08-15 17:51:30 +00: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
lain
aefb9cdee8 Merge branch 'feature/parallel-rendering' into 'develop'
Parallelize template rendering

See merge request pleroma/pleroma!1576
2019-08-15 15:51:11 +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