aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-08-26Extract MastodonAPIController's list actions into ↵Egor Kislitsyn
MastodonAPI.ListController; Add more tests
2019-08-26Extract MastodonAPI.MastodonAPIController.errors/2 to ↵Egor Kislitsyn
MastodonAPI.FallbackController
2019-08-26Add validation in Pleroma.List.create/2Egor Kislitsyn
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-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-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-22fix /inbox for RelayMaksim Pechnikov
2019-08-22fix testMaksim Pechnikov
2019-08-22Merge branch 'develop' into issue/1177Maksim Pechnikov
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-20Merge branch 'fix/admin-api-user-deletion' into 'develop'lain
Fix deactivated user deletion See merge request pleroma/pleroma!1546
2019-08-20Add `:ap_routes` rate limitEgor Kislitsyn
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-19Refactor check_actor_is_activeMaxim Filippov
2019-08-19Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'lain
# Conflicts: # CHANGELOG.md
2019-08-19Add more tests for Database tasks and DigestEmailWorkerSergey Suprunenko
2019-08-19Merge branch 'hotfix/user_unfollow' into 'develop'lain
[#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579
2019-08-18Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'kaniini
Clear follow requests when blocking a user See merge request pleroma/pleroma!1583
2019-08-18Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini
Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575
2019-08-18clear follow requests when blocking a userSadposter
2019-08-16FormattingMark Felder
2019-08-16fixed User.unfollow with synchronization external userMaksim Pechnikov
2019-08-16Merge branch 'pleroma-conversations' into 'develop'lain
Extended Pleroma Conversations See merge request pleroma/pleroma!1535
2019-08-16Add configurable colors and logo for the digest templateEgor Kislitsyn
2019-08-15max_body_size -> max_body_length, as it should beMark Felder
2019-08-15Fix OAuth cleanup worker unconditionally startingrinpatch
!1576 removed enabled/disabled check from the worker, in favor of just not starting it in application.ex if disabled. However a line unconditionally starting the worker was removed
2019-08-15Merge branch 'features/formatting-sub_sup' into 'develop'kaniini
html.ex: Allow sub and sup elements by default Closes #1191 See merge request pleroma/pleroma!1572
2019-08-15Parallelize template renderingrinpatch
2019-08-15Hide muted theads from home/public timelines unless `with_muted` is setrinpatch
2019-08-15Merge branch 'cache-follow-state' into 'develop'lain
Cache follow state Closes #1180 See merge request pleroma/pleroma!1573
2019-08-14Merge branch 'develop' into 'fix/admin-api-user-deletion'Maxim Filippov
# Conflicts: # CHANGELOG.md
2019-08-15Do not check if actor is active when deleting a userMaxim Filippov
2019-08-15Collect stats immediately after initrinpatch
2019-08-15Cache follow staterinpatch
2019-08-14html.ex: Allow sub and sup elements by defaultHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-14Merge branch 'misc-otp-issues' into 'develop'rinpatch
Misc OTP issues See merge request pleroma/pleroma!1567
2019-08-14Merge branch 'fix/http-signatures-post' into 'develop'rinpatch
activitypub: publisher: add (request-target) to http signature when POSTing See merge request pleroma/pleroma!1569
2019-08-14Apply suggestion to lib/pleroma/web/activity_pub/publisher.exkaniini
2019-08-14activitypub: publisher: add (request-target) to http signature when POSTingAriadne Conill
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 16:17:34 +0000