3830cb538b
removed a comments
2020-02-10 09:14:15 +03:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
42f76306e7
Merge branch 'release/1.1.9' into 'stable'
...
Release/1.1.9
See merge request pleroma/pleroma!2189
2020-02-09 12:15:52 +00:00
544bdbfb90
Merge branch 'fix/email-task-otp' into 'develop'
...
Fix email mix task on OTP releases
Closes #1548
See merge request pleroma/pleroma!2191
2020-02-09 12:05:32 +00:00
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
06fec99e1d
mix.exs: bump version to 1.1.9
2020-02-09 12:19:47 +03:00
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
2020-02-09 03:27:29 +03:00
01396a11f2
changelog: add entry for 1.1.9
2020-02-09 01:22:56 +03:00
1e3dda9b1d
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-09 01:14:39 +03:00
be3cdde9db
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
2020-02-09 01:06:58 +03:00
31dc669de6
fix not being able to pin polls
2020-02-09 01:05:07 +03:00
1e74bbc495
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
2020-02-09 01:02:06 +03:00
40727b28a7
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2020-02-09 00:54:05 +03:00
f486556346
fixed Metadata.Utils.scrub_html_and_truncate
2020-02-09 00:52:56 +03:00
a87843693b
Fix never matching clause
...
`length/1` is only used with lists.
2020-02-09 00:44:29 +03:00
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03: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
dad23e3766
need_reboot flag
2020-02-08 13:00:02 +03:00
815f659ed8
Fix MRF documentation
2020-02-07 22:17:08 +04: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
8d01aaa702
Merge branch 'questions-timezone' into 'develop'
...
Questions: Add timezone to `closed` property
Closes #1552
See merge request pleroma/pleroma!2184
2020-02-07 16:04:40 +00:00
d85bcc8627
Questions: Add timezone to `closed` property
2020-02-07 16:57:46 +01:00
f57cea17bc
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
2020-02-07 18:38:36 +03:00
57098713c0
Apply suggestion to docs/API/pleroma_api.md
2020-02-07 15:18:05 +00:00
713645d5c5
Apply suggestion to docs/API/pleroma_api.md
2020-02-07 15:17:42 +00:00
4538a1ee01
EmojiReactions: Remove old API endpoints
2020-02-07 15:01:45 +01:00
ce95882009
EmojiReactions: Add docs and Changelog
2020-02-07 14:59:26 +01:00
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
2020-02-07 10:35:37 +00:00
1b51390e4c
Merge branch 'docs-fix' into 'develop'
...
Fix for config.md
See merge request pleroma/pleroma!2182
2020-02-07 10:10:34 +00:00
01da001da1
fix
2020-02-07 10:48:10 +03:00
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
5b1ef335de
Merge branch 'update/fe-bundle-20200206' into 'develop'
...
Update FE bundle
See merge request pleroma/pleroma!2180
2020-02-06 17:00:46 +00:00
fed9b0d1e0
Update FE bundle
2020-02-06 10:59:41 -06: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
e12bf05f23
Merge branch 'fix/dymamic-docs' into 'develop'
...
Simplify in-database config docs
See merge request pleroma/pleroma!2178
2020-02-06 16:03:29 +00:00
5499f172b2
Merge branch 'config-changes' into 'develop'
...
Config changes
Closes #1547
See merge request pleroma/pleroma!2174
2020-02-06 16:02:46 +00:00
2cc4fbab96
Update CHANGELOG
2020-02-06 18:03:53 +04:00
8b9742ecf5
Cancellation of a follow request for a remote user
2020-02-06 18:02:33 +04:00
6769ecd948
Merge branch 'develop' into fix/dymamic-docs
2020-02-06 15:04:21 +03:00
6722dade42
Simplify in-database config docs
...
Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore)
2020-02-06 15:00:33 +03:00
7a2e153a8d
description change
2020-02-06 13:15:23 +03:00
bdf0a87be9
dropdown type
2020-02-06 12:50:37 +03:00
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
Maksim Pechnikov
Ivan Tashkinov
rinpatch
Haelwenn
lain
Alexander Strizhakov
Egor Kislitsyn
Mark Felder
feld