Roman Chvanikov
|
c5830ac037
|
Merge develop
|
2020-09-13 12:24:57 +03: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 |
|
|
|
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 |
|
Roman Chvanikov
|
880a92ccc7
|
Merge branch 'develop' into feature/expire-mutes
|
2020-09-08 15:16:43 +03:00 |
|
Roman Chvanikov
|
e3f845b243
|
Add expiring mutes for activities
|
2020-09-08 15:13:50 +03:00 |
|
Roman Chvanikov
|
c56e3d4f3b
|
Add expires_in param for account mutes
|
2020-09-08 13:26:44 +03:00 |
|
|
|
d074e54013
|
ForceBotUnlistedPolicy: try to fix test 2
|
2020-09-07 23:28:29 +02:00 |
|
|
|
0a25c92cfa
|
ForceBotUnlistedPolicy: try to fix test
|
2020-09-07 23:18:36 +02:00 |
|
|
|
d2fd1d3481
|
ForceBotUnlistedPolicy: fix test extension
|
2020-09-07 23:04:07 +02:00 |
|
|
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
2020-09-07 22:53:45 +02:00 |
|
|
|
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 |
|
rinpatch
|
e198ba492e
|
Rich Media: Do not cache URLs for preview statuses
Closes #1987
|
2020-09-05 20:53:46 +03:00 |
|
lain
|
9433311923
|
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
|
2020-09-03 11:50:30 +00:00 |
|
|
|
d1a6f67b1d
|
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-02 17:11:24 +00:00 |
|
lain
|
119e11f455
|
Merge branch 'bugfix/mastoapi-lists' into 'develop'
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
|
2020-09-02 17:03:45 +00:00 |
|
Mark Felder
|
cbf7f0e029
|
Disallow password resets for deactivated accounts.
Ensure all responses to password reset events are identical.
|
2020-09-02 09:09:13 -05:00 |
|
rinpatch
|
19691389b9
|
Rich media: Add failure tracking
|
2020-09-02 14:59:52 +03:00 |
|
Alexander Strizhakov
|
03d06062ab
|
don't fail on url fetch
|
2020-09-01 19:39:07 +03:00 |
|
Haelwenn (lanodan) Monnier
|
d872858046
|
Fix removing an account from a list
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
|
2020-09-01 12:49:32 +02:00 |
|
rinpatch
|
126461942b
|
User table: ensure bio is always a string
Gets rid of '|| ""' in multiple places and fixes #2067
|
2020-09-01 10:45:42 +03:00 |
|
Haelwenn (lanodan) Monnier
|
a142da3e4f
|
Add new Emoji Ecto.Type and fix emoji in Question
|
2020-09-01 08:34:57 +02:00 |
|
Maksim Pechnikov
|
f0fefc4f5c
|
marks notifications as read after mute
|
2020-08-28 18:17:44 +03:00 |
|
Haelwenn
|
6b01a09a08
|
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
|
2020-08-27 17:05:53 +00:00 |
|
lain
|
78939c1d16
|
ChatController: Don't die if the recipient is gone.
|
2020-08-27 12:13:18 +02:00 |
|
lain
|
cfc99fe05c
|
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
|
2020-08-26 15:37:30 +02:00 |
|
|
|
fb33321fa2
|
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
|
2020-08-25 21:32:32 +00:00 |
|
lain
|
112bec5225
|
Webfinger: Handle bogus ids better.
|
2020-08-25 17:35:59 +02:00 |
|
