aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-08-25Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into ↵integration/alex.s/gunAriadne Conill
integration/alex.s/gun
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
[#1177] fixed unfollow for relay actor See merge request pleroma/pleroma!1589
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-25Merge branch 'fix-all-custom-fields-deleted' into 'develop'kaniini
Fix not to use unupdated attachments when all fields are deleted See merge request pleroma/pleroma!1596
2019-08-25no drop active connectionsAlex S
2019-08-25Change to use attachment only when fields do not existkPherox
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
user creation admin api will create multiple users See merge request pleroma/pleroma!1170
2019-08-24Activity Expiration: Switch to 'expires_in' system.lain
2019-08-24ActivityExpirationWorker: Fix merge issues.lain
2019-08-24calculated crf for closing connectionsAlex S
don't close conn where are waiting pids
2019-08-24update testsMaksim Pechnikov
2019-08-24 put_resp_header("content-type", "application/activity+json") -> ↵Maksim Pechnikov
put_resp_content_type("application/activity+json")
2019-08-24Merge remote-tracking branch 'origin/develop' into ↵lain
sixohsix/pleroma-post_expiration
2019-08-23some refactoringAlex S
2019-08-23little refactoringAlex S
2019-08-23added tls_opts to connect methodAlex S
2019-08-23basic support for proxiesAlex S
2019-08-22fix /inbox for RelayMaksim Pechnikov
2019-08-22fix testMaksim Pechnikov
2019-08-22Merge branch 'develop' into issue/1177Maksim Pechnikov
2019-08-22opts to verify certificates by gunAlex S
2019-08-22was used with hackneyAlex S
2019-08-22Improve AP routes rate limitEgor Kislitsyn
2019-08-22fixed unfollow for relay actorMaksim Pechnikov
2019-08-22remove old user create and delete routes for adminSachin Joshi
2019-08-21Merge branch 'rate-limit-ap-routes' into 'develop'lain
[#1174] Rate limit AP routes See merge request pleroma/pleroma!1586
2019-08-20purge all remaining hackney usage and references from the treeAriadne Conill
2019-08-20application: don't try to start Pleroma.Gun.Connections automaticallyAriadne Conill
2019-08-20http: remove unused get_conn_for_gun()Ariadne Conill
2019-08-20Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into ↵Ariadne Conill
integration/alex.s/gun
2019-08-20Merge branch 'fix/admin-api-user-deletion' into 'develop'lain
Fix deactivated user deletion See merge request pleroma/pleroma!1546
2019-08-20set adapter opts in connectionAlex S
2019-08-20Add `:ap_routes` rate limitEgor Kislitsyn
2019-08-20sni option if we open connection in gun poolAlex S
2019-08-20tesla gun adapter supports sniAlex S
2019-08-20Merge branch 'digest-template' into 'develop'lain
Improve digest email template See merge request pleroma/pleroma!1565
2019-08-20Merge branch 'feature/custom-fields' into 'develop'lain
Add custom profile fields See merge request pleroma/pleroma!1488
2019-08-20formatting and pool fixAlex S
2019-08-20with sniAlex S
2019-08-20testing without sniAlex S
2019-08-20some fixes and testsAlex S
2019-08-20no need in thisAlex S
2019-08-20some clean up and pleroma headerAlex S
2019-08-20test fixesAlex S
2019-08-20expanding gun connectionsAlex S
closing least frequently used separate pools with settings
2019-08-20no hardcode of versionsAlex S
2019-08-20orderAlex S
2019-08-20like thiisAlex S
2019-08-20like thisAlex S
2019-08-20tls versions for gunAlex S