Alex Gleason
0114754db2
MastodonAPI: Support poll notification
3 years ago
sadposter
e56c319e8f
merge
3 years ago
Sean King
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder
68aa56b9e4
Just call it shout
3 years ago
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
Mark Felder
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
3 years ago
sadposter
50a644a221
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
3 years ago
Sean King
fa2e62078c
Remove MastoFE configuration stuff
3 years ago
Mark Felder
8b81d62227
Upstream original followbot implementation
4 years ago
sadposter
5f62b55a6f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
rinpatch
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
4 years ago
Haelwenn (lanodan) Monnier
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
Ivan Tashkinov
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
Ivan Tashkinov
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
sadposter
5f33699169
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Ivan Tashkinov
b981edad8a
[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
4 years ago
rinpatch
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
4 years ago
Ivan Tashkinov
349b8b0f4f
[ #3213 ] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
4 years ago
Ivan Tashkinov
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
4 years ago
Ivan Tashkinov
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
4 years ago
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Ivan Tashkinov
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
Ivan Tashkinov
9948ff3356
[ #3213 ] Added HashtagsCleanupWorker periodic job.
4 years ago
feld
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
4 years ago
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
4 years ago
sadposter
3aa25b008d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder
003402df40
Add ability to invalidate cache entries for Apache
4 years ago
eugenijm
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
Alexander Strizhakov
5ade430e46
changed naming in changelog
4 years ago
Alexander Strizhakov
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
4 years ago
feld
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
4 years ago
Mark Felder
086100e3b7
Consistent comment style for :ex_aws
4 years ago
Mark Felder
f9e0c05ca4
Only run one attachment cleanup job per node
...
The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.
4 years ago
Mark Felder
f0ab60189e
truncated_namespace should default to nil
4 years ago
Mark Felder
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
Alex Gleason
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
4 years ago
Mark Felder
d69c78ceb9
Remove configurability of upload proxy opts, simplify
4 years ago
sadposter
6cd0586ef9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
4 years ago
lain
9a744d49c8
Jason: Remove by now superfluous jason_types file
4 years ago
Ivan Tashkinov
62bf4a1292
[ #2353 ] Virtually never-expiring OAuth tokens (new and already issued ones).
4 years ago
Alexander Strizhakov
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
4 years ago
Ivan Tashkinov
7fff9c1bee
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
4 years ago
Alexander Strizhakov
94480c6607
removing fed sockets settings
4 years ago
lain
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
4 years ago
rinpatch
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
4 years ago
sadposter
7947236575
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
lain
294628d981
Merge branch 'feature/expire-mutes' into 'develop'
...
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
4 years ago
lain
d8d4e96230
Merge branch 'default-mrf' into 'develop'
...
Add TagPolicy as default MRF
See merge request pleroma/pleroma!2834
4 years ago
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain
bae48c98e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
4 years ago
sadposter
ddf36b096e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
4 years ago
feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
4 years ago
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
04b7505c75
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
4 years ago
Egor Kislitsyn
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
Ivan Tashkinov
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
4 years ago
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Mark Felder
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
4 years ago
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
4 years ago
Alex Gleason
b3d6cf9022
Merge remote-tracking branch 'upstream/develop' into block-behavior
4 years ago
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
4 years ago
Alexander Strizhakov
3be8ab5103
RemoteIp module name
4 years ago
Alex Gleason
2fc7ce3e1e
Blocks: add blockers_visible config
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
87fc5a40f4
instrumenters has no effect in Endpoint anymore
4 years ago
Mark Felder
fddea9e3ce
:pubsub is deprecated and replaced wit :pubsub_server
4 years ago
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
4 years ago
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
4 years ago
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
4 years ago
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
4 years ago
sadposter
a9938611f7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Alexander Strizhakov
cbdaabad34
web push http_client fix
4 years ago
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
lain
7e02f4ed3b
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
...
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
4 years ago
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
4 years ago
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
sadposter
95a1e5bf5a
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
rinpatch
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
4 years ago
Roman Chvanikov
c5830ac037
Merge develop
4 years ago
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
4 years ago
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
4 years ago
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
4 years ago
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
sadposter
d0ffefc270
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
4 years ago