Alexander Strizhakov
|
aae1af8cf1
|
fix for emoji pagination in pack show
|
2020-06-24 18:06:30 +03: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 |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
2020-06-22 23:45:29 +02: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
|
b3a549e916
|
Update NotificationOperation spec
|
2020-06-22 19:18:33 +04: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
|
b05f795326
|
Credo fixes
|
2020-06-22 14:02:29 +02: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
|
9438f83f83
|
Transmogrifier: Handle Update with the pipeline.
|
2020-06-22 13:16:05 +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
|
b5f13af7ba
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
|
2020-06-20 10:59:08 +00: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
|
0e789bc55f
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
|
2020-06-20 09:39:50 +00:00 |
|
lain
|
4cb7b1ebc6
|
Apply suggestion to lib/mix/tasks/pleroma/config.ex
|
2020-06-20 09:34:34 +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 |
|
feld
|
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 |
|
Sergey Suprunenko
|
ac0344dd24
|
Only accounts with Service actor_type are considered as bots
|
2020-06-19 21:19:00 +02:00 |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
2020-06-19 21:18:07 +02:00 |
|
lain
|
75670a99e4
|
UpdateValidator: Only allow updates from the user themselves.
|
2020-06-19 16:38:57 +02:00 |
|
lain
|
cafdf18408
|
Merge branch '1873-pagination-fixes' into 'develop'
[#1873] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
|
2020-06-19 13:42:57 +00:00 |
|
lain
|
372533b7c3
|
Merge branch 'dry-up-follower-update' into 'develop'
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
|
2020-06-19 13:40:34 +00:00 |
|
lain
|
abdb540d45
|
ObjectValidators: Add basic UpdateValidator.
|
2020-06-19 15:30:30 +02:00 |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
2020-06-19 16:14:06 +03:00 |
|
Alexander Strizhakov
|
02ca8a363f
|
default page size for files
|
2020-06-19 14:46:38 +03:00 |
|
Alexander Strizhakov
|
3e3f9253e6
|
adding overall count for packs and files
|
2020-06-19 10:17:24 +03:00 |
|
Alexander Strizhakov
|
4975ed86bc
|
emoji pagination for pack show action
|
2020-06-18 18:50:03 +03:00 |
|
Alexander Strizhakov
|
3becdafd33
|
emoji packs pagination
|
2020-06-18 14:32:21 +03:00 |
|
Maksim Pechnikov
|
c9b5e3feda
|
revert 'database' option to rejected keys
|
2020-06-18 05:29:31 +03:00 |
|