 feld
|
9b740cfb23
|
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
|
2020-03-04 18:22:37 +00:00 |
Alexander Strizhakov
|
b34bc669b9
|
adding descriptions
|
2020-03-04 20:09:18 +03:00 |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
2020-03-04 18:09:06 +01:00 |
|
Alexander Strizhakov
|
fe47bcde8c
|
updating tesla ref
|
2020-03-04 19:44:03 +03:00 |
|
Alexander Strizhakov
|
d6bebd4f9c
|
moving some logic to tesla adapter
- checking original inside gun adapter
- flushing streams on max_body error
|
2020-03-04 18:13:24 +03:00 |
|
lain
|
6f7a8c43a2
|
Merge branch 'fix/no-email-no-fail' into 'develop'
Do not fail when user has no email
See merge request pleroma/pleroma!2249
|
2020-03-04 12:43:06 +00:00 |
|
Alexander Strizhakov
|
22d52f5691
|
same copyright date format
|
2020-03-04 09:41:23 +03:00 |
|
Alexander Strizhakov
|
6b2fb9160c
|
otp version
|
2020-03-04 09:23:42 +03:00 |
|
Alexander Strizhakov
|
8d9dee1ba9
|
retry_timeout description change
|
2020-03-04 08:56:36 +03:00 |
|
Mark Felder
|
d9c5ae7c09
|
Update Copyrights for gun related files
|
2020-03-03 17:16:24 -06:00 |
|
Mark Felder
|
4427161ca3
|
Merge branch 'develop' into gun
|
2020-03-03 17:15:49 -06:00 |
|
Haelwenn
|
5992c256ad
|
Merge branch 'chore/update-copyrights' into 'develop'
Update Copyrights
See merge request pleroma/pleroma!2269
|
2020-03-03 23:15:12 +00:00 |
|
Mark Felder
|
5592db4757
|
Older copyright updates
|
2020-03-03 16:46:45 -06:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
Ivan Tashkinov
|
b6fc98d9cd
|
[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
|
2020-03-03 22:22:02 +03:00 |
|
Alexander Strizhakov
|
884d9710b2
|
refactoring for gun api modules
|
2020-03-03 19:24:14 +03:00 |
|
Alexander Strizhakov
|
23f407bf09
|
don't test gun itself
|
2020-03-03 18:57:16 +03:00 |
|
Alexander Strizhakov
|
f98ee730f0
|
adapter renaming to adapter_helper
|
2020-03-03 18:53:44 +03:00 |
|
Alexander Strizhakov
|
8854770fc4
|
retry and retry_timeout settings default change
|
2020-03-03 18:01:35 +03:00 |
|
Alexander Strizhakov
|
1ad34bfdba
|
no try block in checkout connection
|
2020-03-03 17:44:04 +03:00 |
|
Alexander Strizhakov
|
3723d72365
|
proxy parse tests fix
|
2020-03-03 17:32:59 +03:00 |
|
Alexander Strizhakov
|
24bf5c4e89
|
remove try block from pool request
|
2020-03-03 17:27:56 +03:00 |
|
Alexander Strizhakov
|
aaa879ce75
|
proxy parsing errors
|
2020-03-03 17:27:22 +03:00 |
|
Alexander Strizhakov
|
6ebf389d6e
|
poolboy timeout fix
|
2020-03-03 16:51:49 +03:00 |
|
Alexander Strizhakov
|
7c0ed9302c
|
unnecessary mock
|
2020-03-03 16:46:20 +03:00 |
|
Alexander Strizhakov
|
8fc00b7cbf
|
return error if connection failed to open
|
2020-03-03 16:42:24 +03:00 |
|
Alexander Strizhakov
|
7d68924e4f
|
naming
|
2020-03-03 16:42:24 +03:00 |
|
Alexander Strizhakov
|
e605e79df9
|
simplification of formatting host method
case for format_proxy method
|
2020-03-03 16:42:03 +03:00 |
|
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 |
|
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 |
|
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 |