squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,506 Commits 154 Branches 42 Tags 503 MiB
361940e119
Commit Graph

4280 Commits

Author SHA1 Message Date
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
Maxim Filippov
5171aa5b4d Refactor check_actor_is_active 2019-08-19 20:36:25 +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
Ariadne Conill
337340c3a1 gun: connection pool: allow the connection pool to be started with a name when appropriate 2019-08-19 00:00:22 +00:00
Ariadne Conill
a53a450550 gun: connection pool worker: start up when in the test environment 2019-08-18 23:34:28 +00:00
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
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
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
5aa1b8283d adding host header for gun adapter 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
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
Egor Kislitsyn
158231cd20 Add configurable colors and logo for the digest template 2019-08-16 18:32:25 +07: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
Maxim Filippov
ec969eec51 Merge branch 'develop' into 'fix/admin-api-user-deletion' 
# Conflicts:
#   CHANGELOG.md
 2019-08-14 22:45:32 +00:00
Maxim Filippov
2b94ae3b39 Do not check if actor is active when deleting a user 2019-08-15 01:35:29 +03:00
rinpatch
e8a8d50138 Collect stats immediately after init 2019-08-15 01:01:13 +03:00
rinpatch
bd5ad0af78 Cache follow state 2019-08-15 00:47:30 +03:00
rinpatch
a9e75fa6a4 Add a task to benchmark timeline rendering 2019-08-15 00:43:02 +03:00
Haelwenn (lanodan) Monnier
a6a814420d
html.ex: Allow sub and sup elements by default 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
 2019-08-14 22:49:13 +02:00
rinpatch
31d576de0c Merge branch 'misc-otp-issues' into 'develop' 
Misc OTP issues

See merge request pleroma/pleroma!1567
 2019-08-14 19:22:15 +00:00
rinpatch
dc902ad3df Merge branch 'fix/http-signatures-post' into 'develop' 
activitypub: publisher: add (request-target) to http signature when POSTing

See merge request pleroma/pleroma!1569
 2019-08-14 19:16:52 +00:00
kaniini
1754f8ce6d Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex 2019-08-14 19:05:44 +00:00
Ariadne Conill
5bb418a90d activitypub: publisher: add (request-target) to http signature when POSTing 2019-08-14 19:01:51 +00:00
Ariadne Conill
626e094589 MRF: fix up unserializable option lists in describe implementations 2019-08-14 18:54:17 +00:00
stwf
c43152f6c1 fix formatting 2019-08-14 14:01:11 -04:00
stwf
d81f63845a Implement Pleroma.Stats as GenServer 2019-08-14 11:59:33 -04:00
stwf
574856ef01 streamline Streamer pings 2019-08-14 11:58:32 -04:00
stwf
15ef521009 Isolate OAuth.Token.CleanWorker 2019-08-14 11:57:50 -04:00
stwf
51bdf0cab6 use default child_specs 2019-08-14 11:55:17 -04:00
lain
d3af9e19ed Conversations: Load relations in one query. 2019-08-14 17:01:11 +02:00
Egor Kislitsyn
c9970feee2 Fix compatibility with Elixir 1.8 2019-08-14 21:03:25 +07:00
lain
f73212b2a3 Conversation: Render new participation on update. 2019-08-14 15:56:15 +02:00
lain
df81abb68c Conversations: Use correct oauth paths for extended api. 2019-08-14 15:55:43 +02:00
Egor Kislitsyn
4b7f1c6995 Improve digest email template 2019-08-14 20:46:05 +07:00
lain
560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
Egor Kislitsyn
672fcbc7b7 Limit custom fields for old remote users 2019-08-14 14:58:06 +07:00
Egor Kislitsyn
e457fcc479 Add :max_remote_account_fields config option 2019-08-14 14:58:06 +07:00