aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2019-08-25Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex...integration/alex.s/gunAriadne Conill
2019-08-25Merge branch 'issue/1177' into 'develop'kaniini
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
2019-08-24Activity Expiration: Switch to 'expires_in' system.lain
2019-08-24update testsMaksim Pechnikov
2019-08-24 put_resp_header("content-type", "application/activity+json") -> put_resp_con...Maksim Pechnikov
2019-08-24Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expi...lain
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
2019-08-20purge all remaining hackney usage and references from the treeAriadne Conill
2019-08-20Merge branch 'fix/admin-api-user-deletion' into 'develop'lain
2019-08-20Add `:ap_routes` rate limitEgor Kislitsyn
2019-08-20Merge branch 'digest-template' into 'develop'lain
2019-08-20Merge branch 'feature/custom-fields' into 'develop'lain
2019-08-19Refactor check_actor_is_activeMaxim Filippov
2019-08-18more fixesAlex S
2019-08-18debug for media proxyAlex S
2019-08-18headers standardisation for teslaAlex S
2019-08-18namingsAlex S
2019-08-18Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'kaniini
2019-08-16Merge branch 'pleroma-conversations' into 'develop'lain
2019-08-16Add configurable colors and logo for the digest templateEgor Kislitsyn
2019-08-15Parallelize template renderingrinpatch
2019-08-15Hide muted theads from home/public timelines unless `with_muted` is setrinpatch
2019-08-14Merge branch 'develop' into 'fix/admin-api-user-deletion'Maxim Filippov
2019-08-15Do not check if actor is active when deleting a userMaxim Filippov
2019-08-15Cache follow staterinpatch
2019-08-14Merge branch 'misc-otp-issues' into 'develop'rinpatch
2019-08-14Merge branch 'fix/http-signatures-post' into 'develop'rinpatch
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
2019-08-14MRF: fix up unserializable option lists in describe implementationsAriadne Conill
2019-08-14streamline Streamer pingsstwf
2019-08-14Isolate OAuth.Token.CleanWorkerstwf
2019-08-14use default child_specsstwf
2019-08-14Conversations: Load relations in one query.lain
2019-08-14Conversation: Render new participation on update.lain
2019-08-14Conversations: Use correct oauth paths for extended api.lain
2019-08-14Improve digest email templateEgor Kislitsyn
2019-08-14Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-14Add `:max_remote_account_fields` config optionEgor Kislitsyn
2019-08-14Use info.fields instead of source_data for remote usersEgor Kislitsyn
2019-08-14Linkify custom fields values in ActivityPub.UserViewxEgor Kislitsyn
2019-08-14Support user attachment update in TransmogrifierEgor Kislitsyn