514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
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.
2020-02-11 15:39:19 -06:00
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
2020-02-08 14:02:36 +00:00
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-07 20:14:06 +03:00
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
ce95882009
EmojiReactions: Add docs and Changelog
2020-02-07 14:59:26 +01:00
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
2020-02-06 16:08:23 +00:00
2cc4fbab96
Update CHANGELOG
2020-02-06 18:03:53 +04:00
2a3e06eb70
Apply suggestion to CHANGELOG.md
2020-02-05 18:28:05 +00:00
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
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
2020-01-30 19:24:04 +00:00
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2020-01-30 22:16:55 +03:00
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
2020-01-30 18:47:44 +00:00
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
2020-01-30 13:16:04 +00:00
7499805abf
config.exs: Re-enable rate limiter and enable remote ip
2020-01-30 00:06:58 +03:00
f5f7a0f9c1
Update confusing changelog message for attachments cleanup
2020-01-29 18:53:25 +03:00
d378550d2d
Emoji Reactions: Document changes
2020-01-29 11:40:57 +01:00
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
bcffa662dc
Merge branch 'develop' into feature/tag_feed
2020-01-27 21:13:13 +03:00
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
a43b73bba9
Document dynamic_configuration breaking change
2020-01-24 08:04:25 -06:00
9a994878f1
Emoji reactions: Update docs and changelog
2020-01-24 10:53:01 +01:00
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
002146d297
Update changelog
2020-01-22 20:12:45 +01:00
043cd5aa54
Emoji reactions: Document changes
2020-01-22 13:58:02 +01:00
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
7518f3877f
Update changelog
2020-01-20 16:31:12 +01:00
4c5b5f14dc
StatusView: Add `emoji_reactions`
2020-01-20 16:24:20 +01:00
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
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
2020-01-12 18:37:52 +00:00
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
180f257ced
Update CHANGELOG.md
2020-01-06 14:10:07 +00:00
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
2020-01-05 17:38:51 +03:00
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
Alexander Strizhakov
Mark Felder
lain
rinpatch
Haelwenn
feld
Egor Kislitsyn
Roman Chvanikov
Haelwenn (lanodan) Monnier
Maksim Pechnikov
Hakaba Hitoyo
Ivan Tashkinov
eugenijm