lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
lain
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
...
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
4 years ago
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
4 years ago
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
4 years ago
Haelwenn (lanodan) Monnier
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold
4 years ago
lain
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
Mark Felder
bee29f6610
Clarify location of frontends directory
4 years ago
lain
08732e8a03
Docs: Add frontend info to cheat sheet.
4 years ago
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
4 years ago
Maksim Pechnikov
5879d36854
fix sender for welcome email
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Maksim Pechnikov
3edaecae96
added welcome email
4 years ago
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
rinpatch
c413649a8d
Bring back oban job pruning
...
Closes #1945
4 years ago
rinpatch
33747e9366
config.exs: set gun retries to 0
...
The new pooling code just removes the connection when it's down,
there is no need to reconnect a connection that is just sitting idle,
better just open a new one next time it's needed
4 years ago
rinpatch
9df5918974
config.exs: make gun the default again
4 years ago
rinpatch
4128e3a84a
HTTP: Implement max request limits
4 years ago
rinpatch
58a4f350a8
Refactor gun pooling and simplify adapter option insertion
...
This patch refactors gun pooling to use Elixir process registry and
simplifies adapter option insertion.
Having the pool use process registry instead of a GenServer has a number of advantages:
- Simpler code: the initial implementation adds about half the lines of code it deletes
- Concurrency: unlike a GenServer, ETS-based registry can handle multiple checkout/checkin
requests at the same time
- Precise and easy idle connection clousure: current proposal for closing idle connections in
the GenServer-based pool needs to filter through all connections once a minute and compare their
last active time with closing time. With Elixir process registry this can be done
by just using `Process.send_after`/`Process.cancel_timer` in the worker process.
- Lower memory footprint: In my tests `gun-memory-leak` branch uses about 290mb on peak load (250 connections)
and 235mb on idle (5-10 connections). Registry-based pool uses 210mb on idle and 240mb on peak load
4 years ago
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
Haelwenn (lanodan) Monnier
312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
lain
8939ff39e4
Merge branch 'remove-twitter-api' into 'develop'
...
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
4 years ago
DYM
a784c09db8
added hyper:// to default protocols
4 years ago
lain
65fd28e0c4
Config: Remove Statusnet preloader.
4 years ago
lain
af7720237b
Upload: Restrict description length
4 years ago
Mark Felder
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
4 years ago
lain
0313520cd2
Config: Reduce default preloaders to configuration endpoints.
...
Fetching the timeline is a bit heavy to do by default.
4 years ago
feld
8288419686
Merge branch 'preload-data' into 'develop'
...
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
4 years ago
Maksim Pechnikov
439a1a0218
added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Maksim Pechnikov
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
Maksim Pechnikov
a8d967762e
migrate to oban 2.0-rc1
4 years ago
Mark Felder
bf8310f380
Add missing default config value for :instance, instance_thumbnail
...
Follows up on b7fc61e17b
4 years ago
Mark Felder
3462d4b995
Merge branch 'develop' into issue/1855
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
Maksim Pechnikov
579763126f
Merge branch 'develop' into issue/1855
4 years ago
Maksim Pechnikov
2e8a236cef
fix invalidates media url's
4 years ago
Mark Felder
26f710b9e3
Merge branch 'develop' into preload-data
4 years ago