Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
4 years ago |
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
4 years ago |
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
4 years ago |
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
4 years ago |
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
4 years ago |
Haelwenn (lanodan) Monnier
|
6a679d80c9
|
Move get_favicon to Pleroma.Instances, use /
|
4 years ago |
Haelwenn (lanodan) Monnier
|
f6d09fafee
|
Add support for remote favicons
|
4 years ago |
lain
|
db76c26469
|
AccountViewTest: Fix test.
|
4 years ago |
lain
|
3250228be9
|
AccountView: Add 'accepts_chat_messages' to view.
|
4 years ago |
Mark Felder
|
69848d5c97
|
Rename notification "privacy_option" setting
|
4 years ago |
Mark Felder
|
fd5e797379
|
Simplify notification filtering settings further
|
4 years ago |
Mark Felder
|
433c01b370
|
Merge branch 'develop' into refactor/notification_settings
|
4 years ago |
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
4 years ago |
Haelwenn (lanodan) Monnier
|
e1b07402ab
|
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
4 years ago |
lain
|
af6d01ec93
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
Mark Felder
|
9eea800026
|
Refactor notification settings
|
4 years ago |
rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
4 years ago |
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
lain
|
3cff4e24cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
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
|
4 years ago |
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
4 years ago |
lain
|
dcb5cda324
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
4 years ago |
lain
|
7637ef4203
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
4 years ago |
Maksim Pechnikov
|
bd261309cc
|
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
|
4 years ago |
lain
|
8c2c325598
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
lain
|
ca598e9c27
|
AccountView: Return user ap_id.
|
5 years ago |
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
5 years ago |
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
5 years ago |
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
5 years ago |
Haelwenn (lanodan) Monnier
|
b30fb1f3bb
|
User: Fix use of source_data in profile_url/1
|
5 years ago |
Haelwenn (lanodan) Monnier
|
2553400a66
|
Initial failing test statement against funkwhale channels
|
5 years ago |
Ivan Tashkinov
|
dfbc05d496
|
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
|
5 years ago |
Ivan Tashkinov
|
460e41585c
|
Further preloading (more endpoints), refactoring, tests.
|
5 years ago |
Haelwenn (lanodan) Monnier
|
15be6ba9c2
|
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
5 years ago |
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
5 years ago |
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
5 years ago |
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
Ivan Tashkinov
|
52cc7de82c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
|
5 years ago |
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
lain
|
50b152766f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
|
5 years ago |
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |