Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
2020-06-29 15:25:57 +03:00 |
|
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
|
2020-06-29 08:39:51 +00:00 |
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
2020-06-26 17:41:00 +00:00 |
|
Haelwenn
|
09478c9cf7
|
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
|
2020-06-26 16:59:46 +00:00 |
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
2020-06-26 13:04:15 +02:00 |
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
2020-06-26 12:06:00 +02:00 |
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
2020-06-26 11:58:40 +02:00 |
|
|
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
2020-06-25 21:35:39 +00:00 |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
2020-06-25 12:40:39 +02:00 |
|
lain
|
1cd1977c0f
|
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
|
2020-06-25 10:14:19 +00:00 |
|
lain
|
84f9ca1956
|
Blocking: Don't federate if the options is set.
|
2020-06-25 12:03:14 +02:00 |
|
lain
|
44bb7cfccd
|
ActivityPub: Remove block.
|
2020-06-25 11:51:33 +02:00 |
|
lain
|
e38293c8f1
|
Transmogrifier: Switch to pipeline for Blocks.
|
2020-06-25 11:33:54 +02:00 |
|
lain
|
89e5b2046b
|
ObjectValidator: Basic Block support.
|
2020-06-25 11:13:35 +02:00 |
|
lain
|
d137f934df
|
Transmogrifier Test: Extract block handling.
|
2020-06-25 10:54:00 +02:00 |
|
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
|
2020-06-25 06:50:44 +00:00 |
|
Maksim Pechnikov
|
439a1a0218
|
added wrapper Pleroma.HTTP for ExAws.S3
|
2020-06-25 07:12:29 +03:00 |
|
Mark Felder
|
67ab580553
|
Filter outstanding follower requests from deactivated accounts
|
2020-06-24 17:18:53 -05:00 |
|
lain
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
2020-06-24 13:29:08 +02:00 |
|
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
|
2020-06-24 10:42:07 +00:00 |
|
lain
|
65f3eb333b
|
Apply suggestion to test/http/tzdata_test.exs
|
2020-06-24 08:50:33 +00:00 |
|
Maksim Pechnikov
|
721fc7c554
|
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
|
2020-06-24 09:12:32 +03:00 |
|
lain
|
98af7b59e4
|
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
|
2020-06-23 18:10:33 +00:00 |
|
Roman Chvanikov
|
1471b70ef1
|
Merge develop
|
2020-06-23 20:56:55 +03:00 |
|
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
|
2020-06-23 16:38:27 +00:00 |
|
lain
|
b7f297f0bd
|
Merge branch 'issue/1798' into 'develop'
[#1798] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
|
2020-06-23 10:54:15 +00:00 |
|
lain
|
adc199c6a8
|
ActivityPubControllerTest: Capture error log
|
2020-06-23 12:04:51 +02:00 |
|
lain
|
d93e01137b
|
ActivityPubControllerTest: Testing changes.
|
2020-06-23 11:43:20 +02:00 |
|
lain
|
2737809bbf
|
An act of desperation.
|
2020-06-23 11:03:32 +02:00 |
|
lain
|
2c603f2009
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
2020-06-23 10:17:12 +02:00 |
|
Maksim Pechnikov
|
84aa9c78dd
|
fix tests
|
2020-06-23 09:08:24 +03:00 |
|
Maksim Pechnikov
|
2715c40e1d
|
added tests
|
2020-06-23 06:59:00 +03:00 |
|
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
|
2020-06-22 15:40:09 +00:00 |
|
Egor Kislitsyn
|
7e6f43c0d7
|
Add is_muted to notifications
|
2020-06-22 19:03:04 +04:00 |
|
Maksim Pechnikov
|
b0a40fc2e4
|
added verify RUM settings before start app
|
2020-06-22 17:27:49 +03:00 |
|
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
2020-06-22 12:37:10 +00:00 |
|
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
|
2020-06-22 12:25:12 +00:00 |
|
lain
|
e785cd5cae
|
ActivityPub: Remove update and switch to pipeline.
|
2020-06-22 13:59:45 +02:00 |
|
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
|
2020-06-22 11:34:07 +00:00 |
|
lain
|
1e7ca24430
|
Update Handling Test: Fix for re-used update ids.
|
2020-06-22 13:23:21 +02:00 |
|
lain
|
31a4d42ce0
|
SideEffects: Handle user updating.
|
2020-06-22 13:15:37 +02:00 |
|
rinpatch
|
282f492cd5
|
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
|
2020-06-22 10:00:13 +00:00 |
|
lain
|
93ae1c8bd3
|
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
|
2020-06-22 08:41:09 +00:00 |
|
lain
|
35e9282ffd
|
HellthreadPolicy: Restrict to Notes and Articles.
|
2020-06-22 10:35:11 +02:00 |
|
Alexander Strizhakov
|
c5863438ba
|
proper error codes for error in adminFE
|
2020-06-20 13:53:57 +03:00 |
|
lain
|
31761340fe
|
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
|
2020-06-20 09:57:12 +00:00 |
|
lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
2020-06-20 09:33:18 +00:00 |
|
Alexander Strizhakov
|
1a704e1f1e
|
fix for packs pagination
|
2020-06-20 10:56:28 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3d4cfc9c5f
|
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
|
2020-06-20 00:08:26 +02:00 |
|
|
|
f928267773
|
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
|
2020-06-19 20:38:22 +00:00 |
|
