|
|
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 |
|
|
|
b3e9c87724
|
Update emoji_api_controller.ex
|
2020-01-30 14:09:41 +00:00 |
|
|
|
36becd5573
|
Update http_security_plug.ex
|
2020-01-30 14:07:41 +00:00 |
|
rinpatch
|
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 |
|
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.
|
2020-01-30 00:06:58 +03:00 |
|
Haelwenn
|
946de2299c
|
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
|
2020-01-29 20:21:32 +00:00 |
|
Egor Kislitsyn
|
e07e7888d7
|
Fix credo warning
|
2020-01-29 18:53:43 +04:00 |
|
Egor Kislitsyn
|
2bd4d6289b
|
Make the warning more scarier
|
2020-01-29 18:43:23 +04:00 |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
2020-01-29 15:31:34 +03:00 |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
2020-01-29 11:43:36 +01:00 |
|
lain
|
a802e07241
|
Emoji Reactions: Add reacted field to emoji reactions
|
2020-01-29 11:39:06 +01:00 |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
2020-01-29 11:13:34 +03:00 |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
lain
|
cedee2793d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
|
2020-01-28 17:52:42 +01:00 |
|
lain
|
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 |
|
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
|
2020-01-28 16:38:14 +00:00 |
|
Alexander Strizhakov
|
7bd4c14581
|
meta tag parser respect first title header
|
2020-01-28 19:29:27 +03:00 |
|
lain
|
d385789a45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
|
2020-01-28 17:06:36 +01:00 |
|
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
|
2020-01-28 15:51:45 +00:00 |
|
Haelwenn (lanodan) Monnier
|
4eb935be78
|
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
|
2020-01-28 16:49:38 +01:00 |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
2020-01-28 16:40:44 +01:00 |
|
Egor Kislitsyn
|
6302b40791
|
Warn if HTTPSecurityPlug is disabled
|
2020-01-28 19:14:09 +04:00 |
|
|
|
d9cb8acd3e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
|
2020-01-28 14:52:57 +00:00 |
|
Roman Chvanikov
|
d18a2e4e36
|
Add test for custom base_url when deleting an attachment
|
2020-01-28 17:22:24 +03:00 |
|
Roman Chvanikov
|
804a702f97
|
Fix base_url string trimming
|
2020-01-28 17:07:46 +03:00 |
|
Roman Chvanikov
|
dea968463d
|
Add logging
|
2020-01-28 16:52:20 +03:00 |
|
lain
|
46915207b6
|
Remove whole_db parameter everywhere, it's not used anymore
|
2020-01-28 14:40:40 +01:00 |
|
lain
|
e3fae3380e
|
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
|
2020-01-28 13:38:49 +00:00 |
|
Roman Chvanikov
|
7f78bd7e37
|
Fix __MODULE__ usage
|
2020-01-28 16:38:44 +03:00 |
|
lain
|
95afcae194
|
Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
|
2020-01-28 12:49:22 +00:00 |
|
lain
|
4f004ab92e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
|
2020-01-28 12:40:00 +00:00 |
|
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
2020-01-28 10:43:47 +03:00 |
|
Roman Chvanikov
|
eb4870e1cd
|
Remove unused var
|
2020-01-28 03:54:54 +03:00 |
|
Roman Chvanikov
|
52e08ec9fd
|
explicitly describe perform op in AttachmentsClenupWorker
|
2020-01-28 03:52:50 +03:00 |
|
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-27 21:13:13 +03:00 |
|
|
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
Maksim Pechnikov
|
bfc70fdf29
|
Merge branch 'develop' into issue/1383
|
2020-01-27 08:48:19 +03:00 |
|
Roman Chvanikov
|
86c4b76bf0
|
Fix typo
|
2020-01-27 04:01:50 +03:00 |
|
|
|
36838b516f
|
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
|
2020-01-26 17:35:21 +00:00 |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
2020-01-26 11:23:05 -06:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Alexander Strizhakov
|
de4102b247
|
can be changed in runtime
|
2020-01-25 10:39:10 +03:00 |
|
Alexander Strizhakov
|
6252e82f85
|
respect settings from database in mix tasks
|
2020-01-25 10:33:27 +03:00 |
|
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
2020-01-24 22:12:23 +03:00 |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 21:46:57 +03:00 |
|
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
|
2020-01-24 11:33:02 +00:00 |
|
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
2020-01-24 11:32:25 +00:00 |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
2020-01-24 10:52:24 +01:00 |
|
Alexander Strizhakov
|
6a0f0ac4a2
|
fix for non existing atom
|
2020-01-24 12:22:26 +03:00 |
|
Maksim Pechnikov
|
293281fcbd
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 08:58:07 +03:00 |
|
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
2020-01-23 18:21:29 +03:00 |
|
Alexander Strizhakov
|
e8e57e398f
|
restart config id after truncate
|
2020-01-23 17:48:45 +03:00 |
|
Alexander Strizhakov
|
4344c5d5b9
|
truncate config table on migrate to db task
|
2020-01-23 17:23:02 +03:00 |
|
Maksim Pechnikov
|
8589632d09
|
fixed delete ScheduledActivity
|
2020-01-23 17:18:23 +03:00 |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
2020-01-23 12:34:34 +01:00 |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-23 11:42:10 +03:00 |
|
Maksim Pechnikov
|
5fc2fa8908
|
Merge branch 'develop' into issue/1383
|
2020-01-23 11:11:18 +03:00 |
|
Maksim Pechnikov
|
ce7c887a27
|
removed try/rescue
|
2020-01-23 11:05:08 +03:00 |
|
Maksim
|
6f77b77428
|
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
|
2020-01-23 05:49:00 +00:00 |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
2020-01-23 02:12:03 +00:00 |
|
Mark Felder
|
e151dea276
|
Merge branch 'develop' into feature/new-registrations-digest
|
2020-01-22 15:59:24 -06:00 |
|
Mark Felder
|
ae78059ff4
|
Merge branch 'develop' into features/remote-follow-userpage-redirect
|
2020-01-22 15:05:39 -06:00 |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
2020-01-22 20:06:12 +01:00 |
|
rinpatch
|
6e6f1ead31
|
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
|
2020-01-22 17:55:49 +00:00 |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
2020-01-22 20:20:39 +03:00 |
|
minibikini
|
7c0ac54437
|
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
|
2020-01-22 17:18:55 +00:00 |
|
Egor Kislitsyn
|
5c842e3b68
|
Merge branch 'develop' into feature/new-registrations-digest
|
2020-01-22 21:18:27 +04:00 |
|
|
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
2020-01-22 17:13:17 +00:00 |
|
Egor Kislitsyn
|
b6f5b326e7
|
Fix credo warnings
|
2020-01-22 20:59:58 +04:00 |
|
Egor Kislitsyn
|
aa0f0d4edd
|
Disable NewUsersDigestEmail by default
|
2020-01-22 20:53:06 +04:00 |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
2020-01-22 20:31:42 +04:00 |
|
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
|
2020-01-22 14:11:01 +00:00 |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
2020-01-22 13:57:42 +01:00 |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
2020-01-22 15:14:11 +03:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
2020-01-22 09:30:30 +03:00 |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 20:56:49 +03:00 |
|
Roman Chvanikov
|
22e94bb2c7
|
Merge branch 'develop' into fix/attachments-cleanup
|
2020-01-21 19:45:13 +03:00 |
|
Haelwenn (lanodan) Monnier
|
7bfb8ed14d
|
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
|
2020-01-21 16:46:16 +01:00 |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
2020-01-21 18:42:00 +03:00 |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
2020-01-21 13:13:17 +00:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
2020-01-21 10:14:48 +03:00 |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 09:23:35 +03:00 |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
2020-01-21 07:40:13 +03:00 |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
2020-01-20 18:10:55 +01:00 |
|
rinpatch
|
00d08c9231
|
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
|
2020-01-20 16:31:43 +00:00 |
|
Alexander Strizhakov
|
8023fa48db
|
merge fix
|
2020-01-20 18:25:00 +03:00 |
|
lain
|
4c5b5f14dc
|
StatusView: Add emoji_reactions
|
2020-01-20 16:24:20 +01:00 |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
2020-01-20 14:42:43 +00:00 |
|
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
|
2020-01-20 13:49:06 +00:00 |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
2020-01-20 14:27:59 +01:00 |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
2020-01-20 12:07:12 +00:00 |
|
lain
|
5fddf988ea
|
Pleroma API: emoji_reactions_by does not need authorization
|
2020-01-20 13:05:35 +01:00 |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
2020-01-20 11:26:07 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
rinpatch
|
9367b70f37
|
Merge branch 'features/cleanup-incoming-actor' into 'develop'
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
|
2020-01-20 10:25:17 +00:00 |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
2020-01-20 12:20:26 +03:00 |
|
Roman Chvanikov
|
cde828ff7d
|
Fix credo warning
|
2020-01-19 22:09:47 +03:00 |
|
