Ivan Tashkinov
|
90764670dc
|
[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
|
2020-07-03 11:02:15 +03:00 |
|
|
Ivan Tashkinov
|
3d2989278c
|
[#1892] Excluded bot actors (applications, services) from search results.
|
2020-06-30 21:26:39 +03:00 |
|
|
lain
|
8b7055e25e
|
Credo fixes
|
2020-06-30 11:55:58 +02:00 |
|
|
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
2020-06-30 11:40:34 +02:00 |
|
|
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
2020-06-30 11:35:54 +02:00 |
|
|
rinpatch
|
7bb3618939
|
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
|
2020-06-29 18:06:25 +00:00 |
|
|
lain
|
09c5991f82
|
Apply suggestion to lib/pleroma/notification.ex
|
2020-06-29 16:04:14 +00:00 |
|
|
lain
|
90083a754d
|
Notifications: Never return nil in the notification list.
|
2020-06-29 17:48:18 +02:00 |
|
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
2020-06-29 17:33:00 +04:00 |
|
|
Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
2020-06-29 15:25:57 +03:00 |
|
|
lain
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
2020-06-29 11:41:00 +02:00 |
|
|
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
2020-06-29 11:06:20 +02: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 (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
2020-06-29 03:31:33 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
1566543bec
|
object/fetcher: Pass full Transmogrifier error
|
2020-06-26 20:10:47 +02: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
|
a2002ebb63
|
Preloading: Fix nodeinfo url.
|
2020-06-26 14:48:23 +02:00 |
|
|
lain
|
4a7a34ae8c
|
Preloading: Return correct data for statusnet stuff.
|
2020-06-26 14:47:38 +02: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 |
|
|
Haelwenn (lanodan) Monnier
|
d6c958b4c2
|
nodeinfo: Fix MRF transparency
|
2020-06-26 05:33:59 +02:00 |
|
|
feld
|
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
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
2020-06-25 11:44:04 +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
|
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 |
|
|
Alexander Strizhakov
|
aae1af8cf1
|
fix for emoji pagination in pack show
|
2020-06-24 18:06:30 +03:00 |
|
|
lain
|
4c5fb831b3
|
Status schema: Add parent_visible.
|
2020-06-24 14:33:00 +02: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 |
|
|
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
|
aee815b478
|
ObjectValidator: Clarify type of object.
|
2020-06-23 12:37:05 +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
|
2715c40e1d
|
added tests
|
2020-06-23 06:59:00 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
c116b6d6d6
|
ActivityPubController: Update upload_media @doc
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
|
2020-06-23 04:42:44 +02:00 |
|
|
Haelwenn
|
d21ef5e66b
|
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
|
2020-06-23 01:55:33 +00:00 |
|
|
Mark Felder
|
df5e048cbb
|
Do not need a function to provide fallback value with default defined in config.exs
|
2020-06-22 17:39:02 -05:00 |
|
|
Haelwenn
|
98f014d3be
|
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
|
2020-06-22 21:59:21 +00:00 |
|