rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
4 years ago |
|
lain
|
23e248694d
|
Announcements: Fix all tests.
|
4 years ago |
|
Egor Kislitsyn
|
6609714d66
|
Move Scrobble views to ScrobbleView
|
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 |
|
rinpatch
|
f8190aea5e
|
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
|
4 years ago |
|
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
4 years ago |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
4 years ago |
|
lain
|
fbcc53760e
|
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
|
4 years ago |
|
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
4 years ago |
|
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
4 years ago |
|
Maksim Pechnikov
|
bd261309cc
|
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
|
4 years ago |
|
Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
|
Egor Kislitsyn
|
332e016bcd
|
Add OpenAPI spec for ScheduledActivityController
|
4 years ago |
|
lain
|
db55dc9445
|
ActivityPub: Remove `react_with_emoji`.
|
4 years ago |
|
Ivan Tashkinov
|
d5cdc907e3
|
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
|
4 years ago |
|
Maksim Pechnikov
|
a92c713d9c
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
|
lain
|
5102468d0f
|
Polls: Persist and show voters' count
|
4 years ago |
|
lain
|
28165dad3a
|
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
|
4 years ago |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
5 years ago |
|
Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
5 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
5 years ago |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
5 years ago |
|
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
5 years ago |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
feld
|
ef7d2b0f11
|
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
|
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 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
|
Haelwenn
|
e999c67cee
|
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
|
5 years ago |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
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 |
|
lain
|
1aa8aa7d7f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
5 years ago |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
5 years ago |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
5 years ago |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
863ec33ba2
|
Add support for funkwhale Audio activity
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
|
5 years ago |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Alexander Strizhakov
|
f0753eed0f
|
removing try block in tesla request
added mocks for tests which fail with Tesla.Mock.Error
|
5 years ago |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
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 |
|
Maksim Pechnikov
|
28701c08ad
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
1257331291
|
MastodonAPI.StatusView: Do not use site_name
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
|
5 years ago |
|
Maksim Pechnikov
|
da44ee5b0f
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Maksim Pechnikov
|
b87533760b
|
Merge branch 'develop' into issue/1276
|
5 years ago |
