Commit Graph

1209 Commits (f19c93cdaaf3ea914ec7b82aeb1f253efc9c6d56)

Author SHA1 Message Date
Alex Gleason 0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
3 years ago
Alex Gleason e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
3 years ago
Alex Gleason 32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
3 years ago
Alex Gleason b22f54eb29
Make prod.secret.exs optional (with warning)
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 2557e805a3 Support for configuration via AdminFE
4 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'
4 years ago
sadposter 292ddf730c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Ivan Tashkinov 882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
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
4 years ago
Ivan Tashkinov 77f3da0358 [#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
Ivan Tashkinov a98c4423f3 Apply i1t's suggestion(s) to 1 file(s)
4 years ago
sadposter 5f33699169 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder db7d6f337f Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
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`
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
4 years ago
Ivan Tashkinov a996ab46a5 [#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
4 years ago
rinpatch a52cedba62 Merge branch 'chore/descriptions-improvements' into 'develop'
4 years ago
Mark Felder ce7c275fb3 Improve various descriptions and labels
4 years ago
Mark Felder 2bffa8e020 Make the suggestion match the default value
4 years ago
Mark Felder 4dbb08a19f Improved Mailer descriptions
4 years ago
Ivan Tashkinov d1c6dd97aa [#3213] Partially addressed code review points.
4 years ago
Mark Felder f736501e97 Alpha-sort adapters
4 years ago
Mark Felder 0fcf16dcb8 Move Enabled to top as it's the master control of all email. Description not really needed.
4 years ago
Mark Felder bd828e5c9c More description improvements
4 years ago
Mark Felder 227dd84f11 Update SMTP error description and default value
4 years ago
Mark Felder 9e3e8e2e30 Update Swoosh docs URL, lint
4 years ago
Mark Felder cfc474c5f7 There is no reason to expose these Local adapter settings either.
4 years ago
Mark Felder 6ffe15cc9f Remove No MX lookups setting
4 years ago
Mark Felder 85710b026f Improve SMTP adapter setting descriptions
4 years ago
Mark Felder 9f98885388 No reason to suggest users try the useless "Local" mail adapter
4 years ago
Mark Felder 887db076b5 Load an emoji.txt specific to the test env
4 years ago
feld 008499f65a Merge branch 'develop' into 'fix/2412-filters'
4 years ago
Ivan Tashkinov 1b49b8efe5 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 6fd4163ab6 [#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
4 years ago
Ivan Tashkinov 9948ff3356 [#3213] Added HashtagsCleanupWorker periodic job.
4 years ago
Mark Felder 2048b93929 Add missing :ex_aws, :s3, :region setting
4 years ago
feld d7af0294e6 Merge branch 'service-worker-allowed-header' into 'develop'
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 e709dec2eb Add Invalidation Script url_format setting
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
eugenijm 133644dfa2 Ability to set the Service-Worker-Allowed header
4 years ago
Ivan Tashkinov c041e9c630 [#3213] HashtagsTableMigrator: failures handling fix, retry function.
4 years ago
Ivan Tashkinov 2634a16b4c Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov 5ade430e46
changed naming in changelog
4 years ago
Alexander Strizhakov 6d48144a9d
use proper naming
4 years ago
Alexander Strizhakov b4ff63d020
configurable limits for ConcurrentLimiter
4 years ago
feld 2926713fe5 Merge branch 'deprecate-public_endpoint' into 'develop'
4 years ago
Mark Felder 086100e3b7 Consistent comment style for :ex_aws
4 years ago
Ivan Tashkinov 48b399cedb [#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
4 years ago
Mark Felder f9e0c05ca4 Only run one attachment cleanup job per node
4 years ago
Mark Felder 5627f3642f Not needed in test.exs
4 years ago
Mark Felder f0ab60189e truncated_namespace should default to nil
4 years ago
lain c7cd9bd591 Password: Add password module
4 years ago
Mark Felder 8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
lain ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop'
4 years ago
Alex Gleason 1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
4 years ago
Roger Braun 48cd336a72 allow external emoji
4 years ago
feld 5e128a6be3 Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
4 years ago
Mark Felder d69c78ceb9 Remove configurability of upload proxy opts, simplify
4 years ago
Mark Felder 8864ac65c6 Add dinosaur gif from https://gifs.cc
4 years ago
lain 8e5904daa5 SideEffects.DeleteTest: asyncify.
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'
4 years ago
Mark Felder ce78b64db8 Formatting
4 years ago
Mark Felder 5a084d6f8d Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE
4 years ago
lain 5db1e6c8d3 Pipeline test: Switch from Mock to Mox.
4 years ago
lain ecd39a8fe5 Test config: Raise pool size for postgres.
4 years ago
rinpatch a05e1d4e48 config/description.exs: Remove outdated information about Oban
4 years ago
lain 95a9bdfc37 Tests: Use NullCache for async tests.
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
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
Alexander Strizhakov 5eef4988bf
fix for elixir 1.11
4 years ago
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
sadposter 7947236575 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Alexander Strizhakov efc27f6464
fix for adminFE
4 years ago
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies
4 years ago
lain 294628d981 Merge branch 'feature/expire-mutes' into 'develop'
4 years ago
lain d8d4e96230 Merge branch 'default-mrf' into 'develop'
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 d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Mark Felder 89c356d19f Improve Keyword descriptions for AdminFE
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'
4 years ago
Mark Felder 291189357b Merge branch 'develop' into feature/account-export
4 years ago