c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
5 years ago
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
5 years ago
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
5 years ago
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
5 years ago
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
ca7ac068f0
Add a test
5 years ago
472132215e
Use floki's new APIs for parsing fragments
5 years ago
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
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
5 years ago
19516af74e
Fix `status.expires_in` validation
5 years ago
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
5 years ago
58b2017aa0
Restore TwitterAPI tests
5 years ago
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
ea1631d7e6
Make Floki use fast_html
5 years ago
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
dad23e3766
need_reboot flag
5 years ago
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
4538a1ee01
EmojiReactions: Remove old API endpoints
5 years ago
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
bc2e98b200
Add User.get_follow_state/2
5 years ago
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
5 years ago
8b9742ecf5
Cancellation of a follow request for a remote user
5 years ago
c85aa6e87f
removing confusing error
5 years ago
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
5 years ago
5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
5 years ago
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
50f5a92021
fix not being able to pin polls
5 years ago
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
8057157ee3
Make attachments cleanup optional
5 years ago
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
5 years ago
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
01fb4dbeae
Emoji Reactions: Add fixtures
5 years ago
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
5 years ago
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
5 years ago
e7fee0d6fa
emoji api error on not writable dir
5 years ago
7a60cd91ff
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
5 years ago
Haelwenn
