sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,506 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

4090 Commits

Author SHA1 Message Date
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
Alex S c19d4eeaee no drop active connections 2019-08-25 15:05:34 +03:00
kPherox 3549cd9754
Change to use attachment only when fields do not exist 2019-08-25 01:28:38 +09: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
lain 1692fa8945 ActivityExpirationWorker: Fix merge issues. 2019-08-24 17:22:26 +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
Maksim Pechnikov 6062017493 put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json") 2019-08-24 17:17:17 +03:00
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Alex S 26a98737a8 some refactoring 2019-08-23 20:11:02 +03:00
Alex S 431cf60510 little refactoring 2019-08-23 18:17:13 +03:00
Alex S 65fd5bdf4c added tls_opts to connect method 2019-08-23 17:12:43 +03:00
Alex S e34ca5174c basic support for proxies 2019-08-23 12:57:52 +03:00
Maksim Pechnikov 8dc6a6b210 fix /inbox for Relay 2019-08-22 22:48:07 +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 d812c8bbc7 opts to verify certificates by gun 2019-08-22 12:38:39 +03:00
Alex S 6e66bb35d1 was used with hackney 2019-08-22 12:37:33 +03:00
Egor Kislitsyn a79ebac592 Improve AP routes rate limit 2019-08-22 16:03:43 +07:00
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor 2019-08-22 06:57:55 +03:00
Sachin Joshi 37229af15f remove old user create and delete routes for admin 2019-08-22 00:15:00 +05:45
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop' 
[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586
 2019-08-21 16:45:20 +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 27f7625dd2 application: don't try to start Pleroma.Gun.Connections automatically 2019-08-20 20:13:48 +00:00
Ariadne Conill b7f677dc28 http: remove unused get_conn_for_gun() 2019-08-20 20:11:17 +00:00
Ariadne Conill 490ddd6e0d Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex.s/gun 2019-08-20 20:07:17 +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 cee945bead set adapter opts in connection 2019-08-20 18:37:22 +03:00
Egor Kislitsyn 8d899d6197 Add `:ap_routes` rate limit 2019-08-20 22:10:36 +07:00
Alex S 6f08e77269 sni option if we open connection in gun pool 2019-08-20 18:06:08 +03:00
Alex S 50bc6c5ea9 tesla gun adapter supports sni 2019-08-20 16:09:50 +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 6c3990b1ea with sni 2019-08-20 12:42:53 +03:00
Alex S 5209abf09b testing without sni 2019-08-20 12:42:53 +03:00
Alex S 2a2d11f2b3 some fixes and tests 2019-08-20 12:42:53 +03:00
Alex S af12d08da7 no need in this 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 210e116dc0 no hardcode of versions 2019-08-20 12:41:46 +03:00
Alex S 699fc4f6eb order 2019-08-20 12:41:46 +03:00
Alex S 102ec7bb0c like thiis 2019-08-20 12:41:46 +03:00
Alex S 4a4a61f4ce like this 2019-08-20 12:41:45 +03:00
Alex S 6e1408d05a tls versions for gun 2019-08-20 12:41:45 +03:00