Alex Gleason
|
c4061f06ba
|
Merge branch 'chat-moderation-stable' into chat-moderation
|
2020-09-11 14:30:28 -05:00 |
|
Alex Gleason
|
bc86d0a906
|
Chat moderation: fix formatting
|
2020-09-11 14:29:56 -05:00 |
|
Alex Gleason
|
9733c9d065
|
Merge remote-tracking branch 'upstream/develop' into chat-moderation
|
2020-09-11 14:13:38 -05:00 |
|
Alex Gleason
|
dfb831ca39
|
Chat moderation: add tests for unauthorized access
|
2020-09-11 14:11:07 -05:00 |
|
Alex Gleason
|
e229536e5c
|
Chat Moderation: use explicit sender and recipient fields
|
2020-09-11 14:11:00 -05:00 |
|
Alex Gleason
|
67726453f8
|
Credo fix
|
2020-09-11 14:10:52 -05:00 |
|
Alex Gleason
|
02d70228b5
|
AdminAPI: fix delete chat message
|
2020-09-11 14:10:35 -05:00 |
|
Alex Gleason
|
9dd0b23da4
|
AdminAPI: show chat
|
2020-09-11 14:10:28 -05:00 |
|
Alex Gleason
|
f13b52a703
|
AdminAPI: list messages in a chat
|
2020-09-11 14:10:19 -05:00 |
|
Alex Gleason
|
fb0de07343
|
AdminAPI: list chats for a user
|
2020-09-11 14:10:05 -05:00 |
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
2020-09-11 14:09:58 -05:00 |
|
Alex Gleason
|
f88dc1937e
|
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
|
2020-09-11 14:09:50 -05:00 |
|
Haelwenn (lanodan) Monnier
|
dbc013f24c
|
instance: Handle not getting a favicon
|
2020-09-11 11:37:46 +02:00 |
|
Alexander Strizhakov
|
2c2094d4b2
|
configurable lifetime for ephemeral activities
|
2020-09-10 21:51:59 +03:00 |
|
Alexander Strizhakov
|
eb5ff715f7
|
pin/unpin for activities with expires_at option
|
2020-09-10 21:50:41 +03:00 |
|
Alexander Strizhakov
|
93e1c8df9d
|
reject activity creation
if passed expires_at option and expiring activities are not configured
|
2020-09-10 21:50:41 +03:00 |
|
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
2020-09-10 21:50:40 +03:00 |
|
rinpatch
|
0254696e30
|
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
|
2020-09-10 18:45:04 +00:00 |
|
rinpatch
|
541a3eede2
|
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
|
2020-09-10 18:41:00 +00:00 |
|
Alexander Strizhakov
|
7dd986a563
|
expire mfa tokens through Oban
|
2020-09-10 16:01:19 +03:00 |
|
Alexander Strizhakov
|
3ce658b930
|
schedule expired oauth tokens deletion with Oban
|
2020-09-10 16:01:19 +03:00 |
|
rinpatch
|
0d2814ec8e
|
Metadata: Move restriction check from Feed provider to activated_providers
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
a85ed6defb
|
Do not serve RSS/Atom feeds when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
44ced17634
|
Fix test so setting doesn't leak
|
2020-09-08 20:21:34 +03:00 |
|
Mark Felder
|
ff07014b26
|
Disable providers of user and status metadata when instance is private
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
10ef532c63
|
AP C2S: Restrict character limit on Note
|
2020-09-08 20:21:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
921f926e96
|
Remove OStatus in testsuite
|
2020-09-08 18:43:57 +02:00 |
|
Haelwenn (lanodan) Monnier
|
ee0e05f930
|
Drop unused "inReplyToAtomUri" in objects
|
2020-09-08 18:43:57 +02:00 |
|
feld
|
bf048ab72f
|
Merge branch 'develop' into 'develop'
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
|
2020-09-08 14:52:51 +00:00 |
|
Haelwenn (lanodan) Monnier
|
f6723dc9bd
|
account_view_test: Remove empty test
|
2020-09-08 16:33:22 +02:00 |
|
Haelwenn (lanodan) Monnier
|
788dececff
|
test: remove extraneous :instances_favicons config bits
|
2020-09-08 16:32:54 +02:00 |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
2020-09-08 09:31:26 -05:00 |
|
rinpatch
|
ce3474f4d3
|
Disable favicon scraping in tests
|
2020-09-08 15:09:10 +03:00 |
|
lain
|
9b85592b8b
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-08 13:56:42 +03:00 |
|
rinpatch
|
964bc8e2e8
|
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
|
2020-09-08 13:55:52 +03:00 |
|
feld
|
43b07c31cb
|
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
|
2020-09-08 13:53:47 +03:00 |
|
rinpatch
|
ea4b6c64d6
|
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
|
2020-09-08 13:00:49 +03:00 |
|
rinpatch
|
8c3241df44
|
Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
|
2020-09-08 13:00:15 +03:00 |
|
rinpatch
|
13e606941c
|
Merge branch 'fix/2087-metadata' into 'develop'
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
|
2020-09-08 12:55:30 +03:00 |
|
rinpatch
|
718c7cc847
|
Merge branch 'fix/apc2s-limits' into 'develop'
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
|
2020-09-08 12:51:38 +03:00 |
|
Alibek Omarov
|
d074e54013
|
ForceBotUnlistedPolicy: try to fix test 2
|
2020-09-07 23:28:29 +02:00 |
|
Alibek Omarov
|
0a25c92cfa
|
ForceBotUnlistedPolicy: try to fix test
|
2020-09-07 23:18:36 +02:00 |
|
Alibek Omarov
|
d2fd1d3481
|
ForceBotUnlistedPolicy: fix test extension
|
2020-09-07 23:04:07 +02:00 |
|
Alibek Omarov
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
2020-09-07 22:53:45 +02:00 |
|
Alibek Omarov
|
57cf0cc3b3
|
ForceBotUnlistedPolicy: add test
|
2020-09-07 22:50:57 +02:00 |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
2020-09-07 19:59:17 +03:00 |
|
rinpatch
|
d5c286b802
|
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
|
2020-09-07 11:12:30 +00:00 |
|
lain
|
fdab01ab56
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-07 10:19:19 +00:00 |
|
Haelwenn (lanodan) Monnier
|
08aef7dd4e
|
instance: Log catch favicon errors as warnings
|
2020-09-07 08:40:52 +02:00 |
|
rinpatch
|
170599c390
|
RichMedia: do not log webpages missing metadata as errors
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
|
2020-09-05 22:05:35 +03:00 |
|