lain
|
24c526a0b1
|
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
|
5 years ago |
|
lain
|
964b4d82a0
|
Merge branch 'fix/upload-limit-otp' into 'develop'
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
|
5 years ago |
|
rinpatch
|
15ea75cd2a
|
Actually fix upload limit on OTP releases
Closes #1109
|
5 years ago |
|
Haelwenn
|
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 |
|
Lain Soykaf
|
ce95882009
|
EmojiReactions: Add docs and Changelog
|
5 years ago |
|
feld
|
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 |
|
Egor Kislitsyn
|
2cc4fbab96
|
Update CHANGELOG
|
5 years ago |
|
Alexander Strizhakov
|
2a3e06eb70
|
Apply suggestion to CHANGELOG.md
|
5 years ago |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
5 years ago |
|
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
5 years ago |
|
Roman Chvanikov
|
8057157ee3
|
Make attachments cleanup optional
|
5 years ago |
|
rinpatch
|
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 |
|
rinpatch
|
5b62acf6e9
|
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
|
5 years ago |
|
lain
|
774cba84f5
|
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
|
5 years ago |
|
rinpatch
|
263abe3ba5
|
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
|
5 years ago |
|
rinpatch
|
7499805abf
|
config.exs: Re-enable rate limiter and enable remote ip
|
5 years ago |
|
Roman Chvanikov
|
f5f7a0f9c1
|
Update confusing changelog message for attachments cleanup
|
5 years ago |
|
lain
|
d378550d2d
|
Emoji Reactions: Document changes
|
5 years ago |
|
lain
|
12b6fcdb8c
|
Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
4eb935be78
|
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
|
5 years ago |
|
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Hakaba Hitoyo
|
dabd535e43
|
Remove user recommendation by third party engine
|
5 years ago |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Mark Felder
|
a43b73bba9
|
Document dynamic_configuration breaking change
|
5 years ago |
|
lain
|
9a994878f1
|
Emoji reactions: Update docs and changelog
|
5 years ago |
|
Maksim Pechnikov
|
293281fcbd
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Alexander Strizhakov
|
4344c5d5b9
|
truncate config table on migrate to db task
|
5 years ago |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
lain
|
002146d297
|
Update changelog
|
5 years ago |
|
lain
|
043cd5aa54
|
Emoji reactions: Document changes
|
5 years ago |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
5 years ago |
|
lain
|
7518f3877f
|
Update changelog
|
5 years ago |
|
lain
|
4c5b5f14dc
|
StatusView: Add `emoji_reactions`
|
5 years ago |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
5 years ago |
|
Maksim Pechnikov
|
a5db044e57
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
|
lain
|
aa9fe3a712
|
Merge branch 'develop' into 'feature/tag_feed'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Roman Chvanikov
|
88f0eed0f2
|
Delete attachments when status is deleted
|
5 years ago |
|
feld
|
8b4d81609d
|
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
|
5 years ago |
|
Hakaba Hitoyo
|
0c9c62509d
|
Remove MDII uploader
|
5 years ago |
|
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
5 years ago |
|
lain
|
180f257ced
|
Update CHANGELOG.md
|
5 years ago |
|
eugenijm
|
0b6d1292d2
|
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
|
5 years ago |
|
Maksim Pechnikov
|
b53573a837
|
add tag feeds
|
5 years ago |
|
Egor Kislitsyn
|
6c39fa20b1
|
Add support for `account_id` param to filter notifications by the account
|
5 years ago |
|
Maxim Filippov
|
45180d4c60
|
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
|
5 years ago |
