lain
|
c2a052a346
|
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
|
4 years ago |
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
4 years ago |
lain
|
945e75c8e8
|
SearchController: Trim query.
|
4 years ago |
Mark Felder
|
8121e46f25
|
Merge branch 'develop' into activation-meta
|
4 years ago |
lain
|
311b7c19d0
|
Streamer: Align announce streaming with polling.
|
4 years ago |
lain
|
61fe94d698
|
SideEffects: Refactor.
|
4 years ago |
lain
|
691742e62d
|
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
|
4 years ago |
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
4 years ago |
Mark Felder
|
d69af7f742
|
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
|
4 years ago |
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
4 years ago |
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
4 years ago |
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
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
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
4 years ago |
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
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 |
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
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
|
a2002ebb63
|
Preloading: Fix nodeinfo url.
|
4 years ago |
lain
|
4a7a34ae8c
|
Preloading: Return correct data for statusnet stuff.
|
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 (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
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 |
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
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
|
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
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
4 years ago |
lain
|
88ccade1cb
|
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance
See merge request pleroma/pleroma!2500
|
4 years ago |
lain
|
98af7b59e4
|
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
|
4 years ago |
Roman Chvanikov
|
1471b70ef1
|
Merge develop
|
4 years ago |
Haelwenn
|
c7d69e9256
|
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
|
4 years ago |
lain
|
adc199c6a8
|
ActivityPubControllerTest: Capture error log
|
4 years ago |
lain
|
d93e01137b
|
ActivityPubControllerTest: Testing changes.
|
4 years ago |
lain
|
2737809bbf
|
An act of desperation.
|
4 years ago |
lain
|
2c603f2009
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
4 years ago |
lain
|
46f7e51b27
|
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
|
4 years ago |
Egor Kislitsyn
|
7e6f43c0d7
|
Add `is_muted` to notifications
|
4 years ago |
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
4 years ago |
lain
|
8b5bdd164e
|
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
|
4 years ago |
lain
|
e785cd5cae
|
ActivityPub: Remove `update` and switch to pipeline.
|
4 years ago |
rinpatch
|
c75ba63bef
|
Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
|
4 years ago |
lain
|
1e7ca24430
|
Update Handling Test: Fix for re-used update ids.
|
4 years ago |
lain
|
31a4d42ce0
|
SideEffects: Handle user updating.
|
4 years ago |