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 |
|
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 |
|
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 |
|
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
|
df200ea7a4
|
Merge branch 'http-security-warning' into 'develop'
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
|
5 years ago |
|
feld
|
b3e9c87724
|
Update emoji_api_controller.ex
|
5 years ago |
|
feld
|
36becd5573
|
Update http_security_plug.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 |
|
rinpatch
|
889965141a
|
RemoteIp: only trust X-Forwarded-For
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
|
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 |
|
Egor Kislitsyn
|
e07e7888d7
|
Fix credo warning
|
5 years ago |
|
Egor Kislitsyn
|
2bd4d6289b
|
Make the warning more scarier
|
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
|
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 |
|
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 |
|
Haelwenn
|
271935953a
|
Merge branch 'whole-db-removal' into 'develop'
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
4eb935be78
|
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
|
5 years ago |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
5 years ago |
|
Egor Kislitsyn
|
6302b40791
|
Warn if HTTPSecurityPlug is disabled
|
5 years ago |
|
feld
|
d9cb8acd3e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
|
5 years ago |
|
Roman Chvanikov
|
d18a2e4e36
|
Add test for custom base_url when deleting an attachment
|
5 years ago |
|
Roman Chvanikov
|
804a702f97
|
Fix base_url string trimming
|
5 years ago |
|
Roman Chvanikov
|
dea968463d
|
Add logging
|
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 |
|
Roman Chvanikov
|
7f78bd7e37
|
Fix __MODULE__ usage
|
5 years ago |
|
lain
|
95afcae194
|
Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
|
5 years ago |
|
lain
|
4f004ab92e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
|
5 years ago |
|
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
5 years ago |
|
Roman Chvanikov
|
eb4870e1cd
|
Remove unused var
|
5 years ago |
|
Roman Chvanikov
|
52e08ec9fd
|
explicitly describe perform op in AttachmentsClenupWorker
|
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 |
|
Roman Chvanikov
|
86c4b76bf0
|
Fix typo
|
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 |
|
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
|
8533b63d1f
|
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
|
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 |
|
Alexander Strizhakov
|
6a0f0ac4a2
|
fix for non existing atom
|
5 years ago |
|
Maksim Pechnikov
|
293281fcbd
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
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 |
|
Maksim Pechnikov
|
ce7c887a27
|
removed try/rescue
|
5 years ago |
|
Maksim
|
6f77b77428
|
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
|
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 |
|
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
|
b6f5b326e7
|
Fix credo warnings
|
5 years ago |
|
Egor Kislitsyn
|
aa0f0d4edd
|
Disable NewUsersDigestEmail by default
|
5 years ago |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
5 years ago |
|
rinpatch
|
34aa0c542b
|
Merge branch 'emoji-reaction-extensions-2' into 'develop'
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
|
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 |
|
Roman Chvanikov
|
22e94bb2c7
|
Merge branch 'develop' into fix/attachments-cleanup
|
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 |
