6b5563ed2c
Merge branch 'develop' into feature/1885-MRF-metadata
4 years ago
4c044f6225
Merge branch 'fetcher-fixes' into 'develop'
...
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
4 years ago
b0439df1b5
Merge branch '1907-fix-announce-streaming' into 'develop'
...
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"
Closes #1907
See merge request pleroma/pleroma!2714
4 years ago
d884b6f704
Merge branch 'feature/update-description' into 'develop'
...
Update settings descriptions and labels
See merge request pleroma/pleroma!2709
4 years ago
bad08f34ca
Credo fixes.
4 years ago
ce9b7c0e0f
Changelog: Update with stream changes.
4 years ago
311b7c19d0
Streamer: Align announce streaming with polling.
4 years ago
61fe94d698
SideEffects: Refactor.
4 years ago
fa7a0be225
Merge branch '1716-handle-nickname-clashes' into 'develop'
...
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
4 years ago
fedfe8f7d6
ActivityPub: Handle clashing nicknames for the same ap id
...
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
4 years ago
ce92e6e5ce
Fetcher: Work when we can't get the OP.
4 years ago
8ae572d5ae
Fixtures: Pretty print.
4 years ago
d889c9ca70
Merge branch 'revert-651f2695' into 'develop'
...
Revert "Merge branch 'avatar-removing' into 'develop'"
See merge request pleroma/pleroma!2710
4 years ago
691742e62d
Revert "Merge branch 'avatar-removing' into 'develop'"
...
This reverts merge request !2701
4 years ago
df2d6564d5
Add labels, update descriptions and labels
4 years ago
9cf4bfcd81
Merge branch 'chore/rename-user-settings-column' into 'develop'
...
Rename user.settings column
See merge request pleroma/pleroma!2707
4 years ago
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
4 years ago
b9e6ad571a
Merge branch 'preloadfixups' into 'develop'
...
Some fixups for the preload.
See merge request pleroma/pleroma!2692
4 years ago
8b7055e25e
Credo fixes
4 years ago
0176b7bca2
Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
2382a2a151
Preload: Load the correct instance panel
4 years ago
34c9446cb1
Merge branch 'patch-1' into 'develop'
...
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
4 years ago
27542f19c6
Use correct PostgreSQL version command in bug template
4 years ago
7bb3618939
Merge branch 'fix-notification-filtering' into 'develop'
...
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
4 years ago
09c5991f82
Apply suggestion to lib/pleroma/notification.ex
4 years ago
b2b332984c
Merge branch 'fix/cast-and-validate' into 'develop'
...
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
4 years ago
c01f4ca07f
Notification: Remove TODO.
4 years ago
90083a754d
Notifications: Never return `nil` in the notification list.
4 years ago
3aa04b81c4
Test default "content-type" for CastAndValidate
4 years ago
344a9b28b3
Merge branch 'fix/swoosh-sendmail' into 'develop'
...
updated swoosh
See merge request pleroma/pleroma!2703
4 years ago
979f02ec94
Fix CastAndValidate plug
4 years ago
dc60b1ee58
updated swoosh
4 years ago
07ff2d62f4
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
...
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
4 years ago
6512ef6879
excluding attachment links from RichMedia
4 years ago
651f269568
Merge branch 'avatar-removing' into 'develop'
...
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
4 years ago
e64d08439e
UpdateCredentialsTest: Add test for removing profile images.
4 years ago
8630a6c7f5
Preloaders: Use strings as keys.
4 years ago
a19f8778af
User preloader: Put user info at correct key
4 years ago
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
e229640372
Merge branch 'openapi/schema-account-pleromafields' into 'develop'
...
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
See merge request pleroma/pleroma!2700
4 years ago
9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
4 years ago
cf1bd386c6
Merge branch 'docs/mastoapi-account-fields' into 'develop'
...
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
4 years ago
efb5d64e50
differences_in_mastoapi_responses: Update account fields
4 years ago
4b32bc80de
Merge branch 'reduce-preloading-defaults' into 'develop'
...
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
4 years ago
0313520cd2
Config: Reduce default preloaders to configuration endpoints.
...
Fetching the timeline is a bit heavy to do by default.
4 years ago
dc31fbfe6c
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
...
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
4 years ago
f89390110b
added tab & labels for mrf policies
4 years ago
1566543bec
object/fetcher: Pass full Transmogrifier error
4 years ago
bf1c5e255a
Merge branch 'block-handling' into 'develop'
...
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
4 years ago
09478c9cf7
Merge branch '1258-anti-link-spam-exemption' into 'develop'
...
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
4 years ago
Mark Felder