Ariadne Conill
|
361940e119
|
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex.s/gun
|
2019-08-25 21:00:58 +00:00 |
|
kaniini
|
6dc24422dc
|
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
|
2019-08-25 19:43:27 +00:00 |
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
2019-08-25 19:39:37 +00:00 |
|
kaniini
|
503139b343
|
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
|
2019-08-25 19:35:28 +00:00 |
|
kPherox
|
d74efde94e
|
Update test for custom profile fields
|
2019-08-26 02:06:52 +09:00 |
|
lain
|
5e7098cf69
|
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
|
2019-08-25 16:12:13 +00:00 |
|
Alex S
|
c19d4eeaee
|
no drop active connections
|
2019-08-25 15:05:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
20c3f613d8
|
HttpRequestMock: Remove useless error = error
|
2019-08-25 08:55:29 +02:00 |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
2019-08-25 08:48:38 +02:00 |
|
Haelwenn (lanodan) Monnier
|
211e163770
|
Implement missing mocks for rel=me
|
2019-08-25 08:03:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e22737ffb5
|
HttpRequestMock: Improve non-implemented error message
|
2019-08-25 07:33:46 +02:00 |
|
Haelwenn (lanodan) Monnier
|
18668447d2
|
HttpRequestMock: Log mock errors as warnings
|
2019-08-25 07:33:13 +02:00 |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
Alex S
|
a7aa39cfe4
|
calculated crf for closing connections
don't close conn where are waiting pids
|
2019-08-24 17:44:34 +03:00 |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
2019-08-24 17:41:53 +03:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02:00 |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
2019-08-24 11:03:13 +03:00 |
|
Alex S
|
e34ca5174c
|
basic support for proxies
|
2019-08-23 12:57:52 +03:00 |
|
Maksim Pechnikov
|
399ca9133b
|
fix test
|
2019-08-22 21:54:37 +03:00 |
|
Maksim Pechnikov
|
f95b67c933
|
Merge branch 'develop' into issue/1177
|
2019-08-22 21:13:03 +03:00 |
|
Alex S
|
e8ee0c19e8
|
formatting
|
2019-08-22 12:57:42 +03:00 |
|
Maksim Pechnikov
|
64bfb41c55
|
fixed unfollow for relay actor
|
2019-08-22 06:57:55 +03:00 |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03:00 |
|
Ariadne Conill
|
125ba1dc3d
|
tests: fix up tesla test
|
2019-08-20 21:32:21 +00:00 |
|
Ariadne Conill
|
dd9446474f
|
purge all remaining hackney usage and references from the tree
|
2019-08-20 21:00:08 +00:00 |
|
Ariadne Conill
|
76bb3572dd
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
2019-08-20 20:20:12 +00:00 |
|
Ariadne Conill
|
8f17204221
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
2019-08-20 20:19:23 +00:00 |
|
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
2019-08-20 19:34:47 +00:00 |
|
Alex S
|
4930bc3ca1
|
test fix
|
2019-08-20 18:56:15 +03:00 |
|
lain
|
8340fe8fcc
|
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
|
2019-08-20 12:55:51 +00:00 |
|
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
2019-08-20 12:44:14 +00:00 |
|
Alex S
|
70c4f00349
|
formatting and pool fix
|
2019-08-20 13:10:28 +03:00 |
|
Alex S
|
b8ee025792
|
rebase fixes
|
2019-08-20 12:47:16 +03:00 |
|
Alex S
|
2a2d11f2b3
|
some fixes and tests
|
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
|
fb0d064328
|
more fixes
|
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
|
27d5aa7546
|
ssl fixes
|
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
|
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 |
|
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 |
|