lain
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
2020-06-24 13:29:08 +02: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 |
|
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 |
|
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 |
|
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 |
|
Sergey Suprunenko
|
ac0344dd24
|
Only accounts with Service actor_type are considered as bots
|
2020-06-19 21:19:00 +02:00 |
|
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
2020-06-17 10:34:23 +00:00 |
|
Alexander Strizhakov
|
ed189568f3
|
moving mrf settings from instance to separate group
|
2020-06-16 18:32:18 +03:00 |
|
lain
|
b7df7436c8
|
Conversations: Return last dm for conversation, not last message.
|
2020-06-15 12:27:13 +02:00 |
|
eugenijm
|
b15cfc3d36
|
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
|
2020-06-14 18:27:11 +03:00 |
|
Egor Kislitsyn
|
520367d6fd
|
Fix atom leak in Rich Media Parser
|
2020-06-13 12:08:46 +03:00 |
|
lain
|
3b5282bef2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-08 11:19:18 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e1b07402ab
|
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
2020-06-06 16:23:16 +02:00 |
|
lain
|
ca0e6e702b
|
ChatMessageReference -> Chat.MessageReference
|
2020-06-06 11:51:10 +02:00 |
|
Egor Kislitsyn
|
b02df1803e
|
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
|
2020-06-05 23:15:10 +04:00 |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-05 16:53:56 +02:00 |
|
Haelwenn
|
54bae06b4f
|
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
Unifies all the similar functions to one and simplify some blocks with it.
|
2020-06-05 14:48:02 +00:00 |
|
Egor Kislitsyn
|
317e2b8d61
|
Use atoms as keys in ActivityPub.fetch_* functions options
|
2020-06-04 21:36:26 +04:00 |
|
lain
|
f3ccd50a33
|
ChatMessageReferences: Adjust views
|
2020-06-03 12:49:53 +02:00 |
|
lain
|
37542a9dfa
|
Activity: Remove notifications-related functions.
|
2020-06-02 14:22:16 +02:00 |
|
lain
|
805ab86933
|
Notifications: Make notifications save their type.
|
2020-06-02 13:24:34 +02:00 |
|
lain
|
af6d01ec93
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-29 12:36:17 +02:00 |
|
rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
2020-05-27 19:44:02 +03:00 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
eugenijm
|
b7fc61e17b
|
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
|
2020-05-21 04:41:42 +03:00 |
|
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
2020-05-20 10:53:54 +00:00 |
|
Egor Kislitsyn
|
6609714d66
|
Move Scrobble views to ScrobbleView
|
2020-05-19 16:26:06 +04:00 |
|
lain
|
188b32145e
|
InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
|
2020-05-18 13:29:30 +02:00 |
|
Alexander Strizhakov
|
1671864d88
|
return :visible instead of boolean
|
2020-05-18 10:34:50 +03:00 |
|
Alexander Strizhakov
|
e7bc2f980c
|
account visibility
|
2020-05-18 10:34:49 +03:00 |
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
lain
|
06cad239e5
|
InstanceView: Add pleroma chat messages to nodeinfo
|
2020-05-13 14:05:22 +02:00 |
|
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-13 12:44:16 +02:00 |
|
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
2020-05-13 12:42:36 +03:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
Ivan Tashkinov
|
63a1a82f38
|
[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
|
2020-05-12 19:14:35 +03:00 |
|
lain
|
dcb5cda324
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-12 13:13:43 +02:00 |
|
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
2020-05-10 09:16:48 +03:00 |
|
Ivan Tashkinov
|
ac4250a18c
|
[#2456] Clarified skip_relationships option (and its default of false) for MastodonAPI.AccountView.
|
2020-05-09 19:03:07 +03:00 |
|
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
|
2020-05-09 18:05:44 +03:00 |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
|
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-08 13:13:37 +02:00 |
|
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
2020-05-08 12:35:34 +03:00 |
|
Maksim Pechnikov
|
bd261309cc
|
added unread_notifications_count for /api/v1/accounts/verify_credentials
|
2020-05-06 15:08:38 +03:00 |
|
Maksim Pechnikov
|
8b97b6f5ba
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 14:47:50 +03:00 |
|
lain
|
205313e541
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-06 11:44:30 +02:00 |
|
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
|
Egor Kislitsyn
|
46aae346f8
|
Move single used schemas to Filter operation schema
|
2020-05-05 17:41:01 +04:00 |
|