Ivan Tashkinov
|
d458f4fdca
|
[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
|
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 |
|
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
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
|
d85bcc8627
|
Questions: Add timezone to `closed` property
|
5 years ago |
|
Lain Soykaf
|
4538a1ee01
|
EmojiReactions: Remove old API endpoints
|
5 years ago |
|
Lain Soykaf
|
f875b9650a
|
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
|
5 years ago |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
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 |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
5 years ago |
|
rinpatch
|
15cb1f6804
|
Merge branch 'fix/unpinnable-polls' into 'develop'
fix not being able to pin polls
See merge request pleroma/pleroma!2172
|
5 years ago |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
5 years ago |
|
rinpatch
|
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 |
|
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
5 years ago |
|
Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
5 years ago |
|
Maksim Pechnikov
|
2c40c8b4a2
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
5 years ago |
|
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
5 years ago |
|
lain
|
a0d9d42eaa
|
Emoji Reactions: Actually use the validation.
|
5 years ago |
|
feld
|
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 |
|
feld
|
b3e9c87724
|
Update emoji_api_controller.ex
|
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 |
|
Haelwenn
|
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 |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
5 years ago |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
5 years ago |
|
lain
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
5 years ago |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
lain
|
cedee2793d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
|
5 years ago |
|
lain
|
2c121b2623
|
Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
|
5 years ago |
|
Alexander Strizhakov
|
7bd4c14581
|
meta tag parser respect first title header
|
5 years ago |
|
lain
|
d385789a45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
|
5 years ago |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
5 years ago |
|
lain
|
46915207b6
|
Remove `whole_db` parameter everywhere, it's not used anymore
|
5 years ago |
|
lain
|
e3fae3380e
|
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
|
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
|
bfc70fdf29
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
feld
|
36838b516f
|
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
|
5 years ago |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
5 years ago |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
5 years ago |
|
Ivan Tashkinov
|
86e4d23acb
|
[#1505] Background fetching of incoming activities' `replies` collections.
|
5 years ago |
|
Alexander Strizhakov
|
de4102b247
|
can be changed in runtime
|
5 years ago |
|
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
5 years ago |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
5 years ago |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
|
Maksim Pechnikov
|
8589632d09
|
fixed delete ScheduledActivity
|
5 years ago |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
5 years ago |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
5fc2fa8908
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
5 years ago |
|
Mark Felder
|
e151dea276
|
Merge branch 'develop' into feature/new-registrations-digest
|
5 years ago |
|
Mark Felder
|
ae78059ff4
|
Merge branch 'develop' into features/remote-follow-userpage-redirect
|
5 years ago |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
|
Ivan Tashkinov
|
cf96c40057
|
[#1505] Added Mastodon-compatible `replies` collection to Note federated representation.
|
5 years ago |
|
rinpatch
|
6e6f1ead31
|
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
|
5 years ago |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
minibikini
|
7c0ac54437
|
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
|
5 years ago |
|
Egor Kislitsyn
|
5c842e3b68
|
Merge branch 'develop' into feature/new-registrations-digest
|
5 years ago |
|
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
5 years ago |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
5 years ago |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
5 years ago |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
5 years ago |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
7bfb8ed14d
|
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
|
5 years ago |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
5 years ago |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
5 years ago |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
5 years ago |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
5 years ago |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
5 years ago |
|
rinpatch
|
00d08c9231
|
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
|
5 years ago |
|
Alexander Strizhakov
|
8023fa48db
|
merge fix
|
5 years ago |
|
lain
|
4c5b5f14dc
|
StatusView: Add `emoji_reactions`
|
5 years ago |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
5 years ago |
|
lain
|
42ea480e95
|
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
|
5 years ago |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
5 years ago |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
5 years ago |
|
lain
|
5fddf988ea
|
Pleroma API: `emoji_reactions_by` does not need authorization
|
5 years ago |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
6cf3b19a38
|
transmogrifier.ex: simplify handle_incoming of actors
|
5 years ago |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
5 years ago |
|
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
5 years ago |
|
Maksim Pechnikov
|
108a39c876
|
updated error messages for authentication process
|
5 years ago |
|
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
5 years ago |
|
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
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 |
|
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
5 years ago |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
|
Ivan Tashkinov
|
76c1948880
|
[#1478] Adjusted AdminAPIController admin subscope requirements.
|
5 years ago |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
lain
|
2ee6754095
|
Mix Tasks: Add pleroma.benchmarks.tags
|
5 years ago |
