rinpatch
|
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 |
|
lain
|
09c5991f82
|
Apply suggestion to lib/pleroma/notification.ex
|
4 years ago |
|
lain
|
b2b332984c
|
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
|
4 years ago |
|
lain
|
c01f4ca07f
|
Notification: Remove TODO.
|
4 years ago |
|
lain
|
90083a754d
|
Notifications: Never return `nil` in the notification list.
|
4 years ago |
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
4 years ago |
|
feld
|
344a9b28b3
|
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
|
4 years ago |
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
4 years ago |
|
Maksim Pechnikov
|
dc60b1ee58
|
updated swoosh
|
4 years ago |
|
lain
|
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 |
|
Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
4 years ago |
|
lain
|
651f269568
|
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
|
4 years ago |
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
4 years ago |
|
lain
|
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 |
|
lain
|
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 |
|
Haelwenn (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
4 years ago |
|
Haelwenn
|
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 |
|
Haelwenn (lanodan) Monnier
|
efb5d64e50
|
differences_in_mastoapi_responses: Update account fields
|
4 years ago |
|
lain
|
4b32bc80de
|
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
|
4 years ago |
|
lain
|
0313520cd2
|
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
|
4 years ago |
|
lain
|
dc31fbfe6c
|
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1566543bec
|
object/fetcher: Pass full Transmogrifier error
|
4 years ago |
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
4 years ago |
|
Haelwenn
|
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 |
|
lain
|
6db9f7cdb3
|
Merge branch 'fix-chats' into 'develop'
Nodeinfo: Add chat information back in.
See merge request pleroma/pleroma!2691
|
4 years ago |
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
4 years ago |
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
4 years ago |
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
4 years ago |
|
Haelwenn
|
7c7a6509b9
|
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
nodeinfo: Fix MRF transparency
See merge request pleroma/pleroma!2689
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d6c958b4c2
|
nodeinfo: Fix MRF transparency
|
4 years ago |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
4 years ago |
|
feld
|
2e39fbe02e
|
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
|
4 years ago |
|
feld
|
bb275c4985
|
Merge branch 'update/admin-fe-20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
|
4 years ago |
|
Mark Felder
|
d9e4623628
|
Update AdminFE build
|
4 years ago |
|
Alex Gleason
|
28d4e60f66
|
MastoAPI differences: Document not implemented features
|
4 years ago |
|
lain
|
1d0804b49f
|
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
|
4 years ago |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
4 years ago |
|
lain
|
f585622f85
|
Apply suggestion to config/description.exs
|
4 years ago |
|
lain
|
1cd1977c0f
|
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
|
4 years ago |
|
lain
|
84f9ca1956
|
Blocking: Don't federate if the options is set.
|
4 years ago |
|
lain
|
44bb7cfccd
|
ActivityPub: Remove `block`.
|
4 years ago |
|
lain
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
4 years ago |
|
lain
|
e38293c8f1
|
Transmogrifier: Switch to pipeline for Blocks.
|
4 years ago |
|
lain
|
89e5b2046b
|
ObjectValidator: Basic `Block` support.
|
4 years ago |
|
lain
|
d137f934df
|
Transmogrifier Test: Extract block handling.
|
4 years ago |
|
lain
|
0e26ef2ab9
|
Merge branch 'fix/following-request-from-deactivated' into 'develop'
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
|
4 years ago |
|
Maksim Pechnikov
|
439a1a0218
|
added wrapper Pleroma.HTTP for ExAws.S3
|
4 years ago |
|
Mark Felder
|
67ab580553
|
Filter outstanding follower requests from deactivated accounts
|
4 years ago |
|
lain
|
ae94fcc95f
|
Merge branch 'fix-emoji-pagination' into 'develop'
Fix for emoji pagination in pack show
See merge request pleroma/pleroma!2681
|
4 years ago |
|
Alexander Strizhakov
|
aae1af8cf1
|
fix for emoji pagination in pack show
|
4 years ago |
