lain
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
4 years ago
lain
99bfdffb1d
Config: Add kenoma as available frontend.
4 years ago
lain
4ce4d799fd
Config: Add frontend information.
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
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
lain
e2f82968e8
Config: Update frontend config example
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
Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
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
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
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
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
stwf
75e886b506
fix config
4 years ago
stwf
906ac57ba8
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
...
# Conflicts:
# lib/pleroma/web/preload/status_net.ex
4 years ago
stwf
5677b21e82
clean up
4 years ago
stwf
3b8180d7d1
add status_net/config
4 years ago
stwf
29ae5bb771
preload data into index.html
4 years ago
stwf
aa26dc6a13
add status_net/config
4 years ago
lain
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain
ac31f687c0
Config: Default to Hackney again
...
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
4 years ago
stwf
d67b302810
preload data into index.html
4 years ago
Alex Gleason
d4a18d44fe
Update default instance description
4 years ago
lain
337ca33e5e
Config: Restore old new background image
...
Became lost in a settings restructure
4 years ago
Roman Chvanikov
cc82229ba7
Add filename_display_max_length config
4 years ago
Ivan Tashkinov
3a1e810aaa
[ #2497 ] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
4 years ago
Haelwenn
42b06d78df
Merge branch 'chore/update-config-fe' into 'develop'
...
Synchronize :fe settings in config.exs
See merge request pleroma/pleroma!2560
4 years ago
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Ivan Tashkinov
1871a5ddb4
[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
4 years ago
Mark Felder
4c48626585
Also add new sidebarRight setting
4 years ago
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
4 years ago
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
4 years ago
Mark Felder
918ee46417
Synchronize :fe settings in config.exs
4 years ago
lain
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
4 years ago
Maksim Pechnikov
c33a4315fb
updated docs
4 years ago
Maksim Pechnikov
3f8d68bdf3
added example cache purge script
4 years ago
Maksim Pechnikov
cb40602a16
added media proxy invalidation
4 years ago
Ivan Tashkinov
f1f588fd52
[ #2497 ] Added support for :eimp for image resizing.
4 years ago
Ivan Tashkinov
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
4 years ago
Ivan Tashkinov
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
4 years ago
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
Egor Kislitsyn
f070b5569c
Add a config option to enable strict validation
4 years ago
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
4 years ago
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
4 years ago
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
5 years ago
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago
Mark Felder
b17d8d305f
Enable Gun adapter by default
...
We need devs to dogfood this before we merge it into the 2.1 release
5 years ago
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago