Alexander Strizhakov
|
ee8071f0d5
|
removing unused method
|
2020-03-03 15:12:09 +03:00 |
|
Alexander Strizhakov
|
05429730e4
|
unnecessary with
|
2020-03-03 15:11:48 +03:00 |
|
Alexander Strizhakov
|
d0e4d3ca3b
|
removing unnecessary with
comment in tesla client impovement
|
2020-03-03 14:56:49 +03:00 |
|
sadposter
|
3508f698b9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-03-03 11:16:59 +00:00 |
|
sadposter
|
4709928b06
|
thing
|
2020-03-03 11:14:58 +00:00 |
|
Alexander Strizhakov
|
24d1ac125c
|
hiding raise error logic to otp_version module
|
2020-03-03 13:24:19 +03:00 |
|
Alexander Strizhakov
|
28ed4b41d0
|
naming for checkin from pool timeout
|
2020-03-03 13:05:28 +03:00 |
|
Alexander Strizhakov
|
151dc4e387
|
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
|
2020-03-03 09:53:37 +00:00 |
|
Alexander Strizhakov
|
7eb6592992
|
Apply suggestion to lib/pleroma/pool/connections.ex
|
2020-03-03 09:53:31 +00:00 |
|
Alexander Strizhakov
|
a21a66972f
|
Apply suggestion to lib/pleroma/http/http.ex
|
2020-03-03 09:52:01 +00:00 |
|
Alexander Strizhakov
|
614e3934f9
|
Apply suggestion to lib/pleroma/http/http.ex
|
2020-03-03 09:50:42 +00:00 |
|
Alexander Strizhakov
|
d30ff35d94
|
Apply suggestion to lib/pleroma/http/request_builder.ex
|
2020-03-03 09:46:53 +00:00 |
|
Alexander Strizhakov
|
df3c59d928
|
Apply suggestion to docs/configuration/cheatsheet.md
|
2020-03-03 09:45:18 +00:00 |
|
Alexander Strizhakov
|
a3ad028973
|
Apply suggestion to lib/pleroma/http/adapter.ex
|
2020-03-03 09:34:36 +00:00 |
|
Alexander Strizhakov
|
2c8d80dc0a
|
Apply suggestion to lib/pleroma/pool/connections.ex
|
2020-03-03 09:29:57 +00:00 |
|
Alexander Strizhakov
|
097ad10d02
|
Apply suggestion to lib/pleroma/pool/connections.ex
|
2020-03-03 09:29:51 +00:00 |
|
Alexander Strizhakov
|
4c8569d403
|
otp_version refactor
|
2020-03-03 12:21:10 +03:00 |
|
Alexander Strizhakov
|
3ecdead31a
|
debug logs on pleroma restart
|
2020-03-03 10:33:40 +03:00 |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
2020-03-03 10:08:07 +03:00 |
|
Haelwenn (lanodan) Monnier
|
9b6c7843d6
|
debian_based_*.md: Use erlang-nox metapackage
|
2020-03-03 05:00:25 +01:00 |
|
Egor Kislitsyn
|
4f3313bf80
|
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
|
2020-03-03 00:29:51 +04:00 |
|
Ivan Tashkinov
|
bd8624d649
|
[#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.
|
2020-03-02 22:02:21 +03:00 |
|
Mark Felder
|
f987d83885
|
Clarify in docs how to control connections_pool for Gun.
It could easily be confused with the Hackney settings.
|
2020-03-02 13:00:05 -06:00 |
|
Mark Felder
|
85d571fc23
|
Move Tesla repo to our GitLab
|
2020-03-02 12:52:41 -06:00 |
|
Ivan Tashkinov
|
b4367125e9
|
[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
|
2020-03-02 21:43:18 +03:00 |
|
lain
|
4c02e04935
|
Merge branch 'prepared-statements-settings' into 'develop'
Prepared statements settings
See merge request pleroma/pleroma!2238
|
2020-03-02 17:00:04 +00:00 |
|
Ivan Tashkinov
|
99a6c660a9
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
|
2020-03-02 18:41:12 +03:00 |
|
eugenijm
|
7af431c150
|
Exclude reblogs from GET /api/pleroma/admin/statuses by default
|
2020-03-02 16:47:31 +03:00 |
|
Egor Kislitsyn
|
4a45b96a91
|
Merge branch 'develop' into fix/signup-without-email
|
2020-03-02 15:35:49 +04:00 |
|
rinpatch
|
45b08ca166
|
Merge branch 'docs_cheatsheet_fix' into 'develop'
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
|
2020-03-02 10:05:03 +00:00 |
|
ilja
|
036e8a40a2
|
fix for :fetch_initial_posts
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
|
2020-03-02 10:29:24 +01:00 |
|
Haelwenn
|
764a50f8a6
|
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
|
2020-03-02 07:58:01 +00:00 |
|
Alexander Strizhakov
|
137c600cae
|
stop connections manually
|
2020-03-02 10:01:07 +03:00 |
|
Alexander Strizhakov
|
cc98d010ed
|
relay list shows hosts without accepted follow
|
2020-03-02 09:27:20 +03:00 |
|
Alexander Strizhakov
|
2622cf1190
|
returning repo parameters
|
2020-03-02 09:22:34 +03:00 |
|
Haelwenn
|
6ceef768cb
|
Merge branch 'chores/bump-copyright' into 'develop'
Bump copyright
See merge request pleroma/pleroma!2265
|
2020-03-02 05:15:13 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Haelwenn (lanodan) Monnier
|
6c0d869d9d
|
Bump copyright years of files changed after 2019-01-01
Done via the following command:
git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2020-03-02 05:54:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
deb5f5c40e
|
pleroma_api.md: direct_conversation_id vs. conversation_id
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
|
2020-03-02 04:01:37 +01:00 |
|
rinpatch
|
6471c09372
|
Merge branch 'docs_cheatsheet' into 'develop'
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source
See merge request pleroma/pleroma!2262
|
2020-03-01 19:16:54 +00:00 |
|
Ilja
|
53ef8c11b9
|
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
I also made a more explicit distinction between OTP and from source installs in the general explanation
|
2020-03-01 19:16:54 +00:00 |
|
Alexander Strizhakov
|
d9e4b77f8b
|
Merge branch 'develop' into gun
|
2020-03-01 12:48:49 +03:00 |
|
Alexander Strizhakov
|
400fbc7629
|
wait in mix task while pleroma is rebooted
|
2020-03-01 12:36:09 +03:00 |
|
Alexander Strizhakov
|
34f1d09f3a
|
spec fix
|
2020-03-01 12:01:39 +03:00 |
|
Alexander Strizhakov
|
ba87ed7335
|
fix for compiling
|
2020-03-01 12:01:39 +03:00 |
|
Alexander Strizhakov
|
32d1e04817
|
ActivityPub actions & side-effects in transaction
|
2020-03-01 12:01:39 +03:00 |
|
Phil Hagelberg
|
523f73dccd
|
Fix static FE plug to handle missing Accept header.
|
2020-02-29 18:53:49 -08:00 |
|
rinpatch
|
438394d404
|
Merge branch 'fix/easy-timeline-dos' into 'develop'
Cap the number of requested statuses in timelines to 40 and rate limit them
See merge request pleroma/pleroma!2253
|
2020-02-29 23:08:14 +00:00 |
|
rinpatch
|
b5465bf385
|
timeline controller: add a TODO for replacing copypaste with a macro
|
2020-03-01 02:03:46 +03:00 |
|
rinpatch
|
e6ccf12129
|
changelog: entries for timeline DoS fixes
|
2020-03-01 01:13:08 +03:00 |
|