summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-19added test helpers to clear config after testsMaksim
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-19removes duplicates from relay subscription listMaksim Pechnikov
2019-08-18Merge branch 'chore/fix-ap-muted-tests' into 'develop'kaniini
tests: activitypub: fix muted thread tests See merge request pleroma/pleroma!1584
2019-08-18tests: activitypub: fix typoAriadne Conill
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-18use commonAPI in testsSadposter
2019-08-18clear follow requests when blocking a userSadposter
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-15Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'rinpatch
Fix OAuth cleanup worker unconditionally starting See merge request pleroma/pleroma!1578
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-15Merge branch 'feature/parallel-rendering' into 'develop'lain
Parallelize template rendering See merge request pleroma/pleroma!1576
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 'fix/stats-send-after' into 'develop'rinpatch
Collect stats immediately after init See merge request pleroma/pleroma!1574
2019-08-15Collect stats immediately after initrinpatch
2019-08-15Cache follow staterinpatch
2019-08-15Add a task to benchmark timeline renderingrinpatch
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-14Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'rinpatch
MRF: fix up unserializable option lists in describe implementations See merge request pleroma/pleroma!1568
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-14Merge branch 'fix/revert-tzdata-1.8' into 'develop'lain
Switch to pre-1.8 version of tzdata. Closes #1183 See merge request pleroma/pleroma!1566
2019-08-14Conversations: Load relations in one query.lain
2019-08-14Switch to pre-1.8 version of tzdata.rinpatch
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately tzdata issues bugfix releases for pre-1.8.0 version.
2019-08-14Conversation: Render new participation on update.lain
2019-08-14Conversations: Use correct oauth paths for extended api.lain
2019-08-14Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-14Merge branch 'backport/describe-api-changelog' into 'develop'rinpatch
Backport the describe API changelog entry to develop See merge request pleroma/pleroma!1564
2019-08-14update changelog to cover MRF describe API.Ariadne Conill
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-13docs tweakAriadne Conill
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 13:28:41 +0000