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
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
2020-02-05 21:04:16 +00:00
72d767998c
Merge branch 'removing-admin-api-endpoint' into 'develop'
...
Removing migrate_from_db endpoint from admin api
See merge request pleroma/pleroma!2177
2020-02-05 21:03:56 +00:00
b21e59da5f
Merge branch 'remove-linker-scheme-option' into 'develop'
...
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
2020-02-05 20:32:45 +00: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
3909b5b7b3
Remove AutoLinker `scheme` option from the config
2020-02-05 21:13:56 +04:00
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
a56db78935
Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'
...
Make attachments cleanup optional
See merge request pleroma/pleroma!2170
2020-02-04 15:29:26 +00:00
90b862e7ab
Add cheatsheet entry
2020-02-04 16:22:13 +01:00
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
50f5a92021
fix not being able to pin polls
2020-02-02 14:55:06 +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
01537cc1d6
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-30 18:28:28 +00:00
e52e78a937
Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'
...
Emoji Reactions: Actually use the validation.
See merge request pleroma/pleroma!2166
2020-01-30 18:27:13 +00:00
01fb4dbeae
Emoji Reactions: Add fixtures
2020-01-30 16:26:45 +01:00
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
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
2020-01-30 14:13:40 +00:00
df200ea7a4
Merge branch 'http-security-warning' into 'develop'
...
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
2020-01-30 14:11:29 +00:00
Haelwenn