608773c5ef
Merge branch 'chore/fix-ap-muted-tests' into 'develop'
...
tests: activitypub: fix muted thread tests
See merge request pleroma/pleroma!1584
5 years ago
a2fdc32368
tests: activitypub: fix typo
5 years ago
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
5 years ago
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
5 years ago
58c1391c4d
use commonAPI in tests
5 years ago
94e336d9d5
clear follow requests when blocking a user
5 years ago
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
0f24edcd8d
Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop'
...
Fix OAuth cleanup worker unconditionally starting
See merge request pleroma/pleroma!1578
5 years ago
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!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
5 years ago
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
5 years ago
aefb9cdee8
Merge branch 'feature/parallel-rendering' into 'develop'
...
Parallelize template rendering
See merge request pleroma/pleroma!1576
5 years ago
1ad71592ad
Parallelize template rendering
5 years ago
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
5 years ago
27b747546a
Merge branch 'fix/stats-send-after' into 'develop'
...
Collect stats immediately after init
See merge request pleroma/pleroma!1574
5 years ago
e8a8d50138
Collect stats immediately after init
5 years ago
bd5ad0af78
Cache follow state
5 years ago
a9e75fa6a4
Add a task to benchmark timeline rendering
5 years ago
a6a814420d
html.ex: Allow sub and sup elements by default
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
5 years ago
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
5 years ago
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
5 years ago
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
5 years ago
4be71c91e0
Merge branch 'fix/mrf-describe-keyword-lists' into 'develop'
...
MRF: fix up unserializable option lists in describe implementations
See merge request pleroma/pleroma!1568
5 years ago
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
626e094589
MRF: fix up unserializable option lists in describe implementations
5 years ago
c43152f6c1
fix formatting
5 years ago
d81f63845a
Implement Pleroma.Stats as GenServer
5 years ago
574856ef01
streamline Streamer pings
5 years ago
15ef521009
Isolate OAuth.Token.CleanWorker
5 years ago
51bdf0cab6
use default child_specs
5 years ago
4a5b0965a0
Merge branch 'fix/revert-tzdata-1.8' into 'develop'
...
Switch to pre-1.8 version of tzdata.
Closes #1183
See merge request pleroma/pleroma!1566
5 years ago
d3af9e19ed
Conversations: Load relations in one query.
5 years ago
6a101f0361
Switch to pre-1.8 version of tzdata.
...
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.
5 years ago
f73212b2a3
Conversation: Render new participation on update.
5 years ago
df81abb68c
Conversations: Use correct oauth paths for extended api.
5 years ago
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
744e2ce8b4
Merge branch 'backport/describe-api-changelog' into 'develop'
...
Backport the describe API changelog entry to develop
See merge request pleroma/pleroma!1564
5 years ago
8fab9c5c1c
update changelog to cover MRF describe API.
5 years ago
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
5 years ago
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
5 years ago
8202f1634a
Preload thread mutes/bookmarks in user_statuses
5 years ago
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
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.
5 years ago
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
5 years ago
5983f98f26
docs tweak
5 years ago
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
abfbcfdcb3
mrf_vocabulary: add describe API support
5 years ago
4244e17de0
fix credo
5 years ago
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
5 years ago
10fef2fcee
tests: fix up nodeinfo tests
5 years ago
kaniini