aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
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
2019-08-14MRF: fix up unserializable option lists in describe implementationsAriadne Conill
2019-08-14fix formattingstwf
2019-08-14Implement Pleroma.Stats as GenServerstwf
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-14Fix compatibility with Elixir 1.8Egor Kislitsyn
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-14Limit custom fields for old remote usersEgor Kislitsyn
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-14Add configurable account field name length limitEgor Kislitsyn
2019-08-14Add configurable account field value length limitEgor Kislitsyn
2019-08-14Linkify custom fields values in ActivityPub.UserViewxEgor Kislitsyn
2019-08-14Support user attachment update in TransmogrifierEgor Kislitsyn
2019-08-14Add profile custom fields to ActivityPub.UserViewEgor Kislitsyn
2019-08-14Add custom fields to TwitterAPI.UserViewEgor Kislitsyn
2019-08-14Add custom profile fieldsEgor Kislitsyn
2019-08-14Merge branch 'preload-user-timelines' into 'develop'kaniini
Preload thread mutes/bookmarks in user_statuses See merge request pleroma/pleroma!1563
2019-08-14Merge branch 'get-context-optimizations' into 'develop'kaniini
Preload thread mutes/bookmarks in get_context See merge request pleroma/pleroma!1562
2019-08-14Preload thread mutes/bookmarks in user_statusesrinpatch
2019-08-14Preload thread mutes/bookmarks in get_contextrinpatch
Also removes filtering for creates (was done on the database side already) and filtering for the requested activity (moved to the database side) from application side.
2019-08-13Merge branch 'feature/mrf-vocabulary' into 'develop'rinpatch
MRF Vocabulary See merge request pleroma/pleroma!1559
2019-08-13Merge branch 'feature/mrf-describe' into 'develop'kaniini
MRF describe API See merge request pleroma/pleroma!1561
2019-08-13Merge branch 'length-limit-bio' into 'develop'rinpatch
Add configurable length limits for `User.bio` and `User.name` See merge request pleroma/pleroma!1515
2019-08-13mrf_vocabulary: add describe API supportAriadne Conill
2019-08-13fix credoAriadne Conill