Commit Graph

729 Commits (d64d1b1d452e954cba92d686f9a6b8dea2d304a7)

Author SHA1 Message Date
lain e2772d6bf1 Merge branch 'block-behavior' into 'develop'
3 years ago
Haelwenn 6b3842cf50 Merge branch 'remove/mastofe' into 'develop'
3 years ago
Haelwenn 901204df22 Merge branch 'poll-notification' into 'develop'
3 years ago
Sean King 1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Alex Gleason 33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
3 years ago
Alex Gleason 94db0b7cd6
Add activity+json to Phoenix :format_encoders
3 years ago
Alex Gleason 62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason 0114754db2
MastodonAPI: Support poll notification
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
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
rinpatch f930e83fa2 Merge branch 'fix/remove_auto_nsfw' into 'develop'
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 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
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 9948ff3356 [#3213] Added HashtagsCleanupWorker periodic job.
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
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
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
Mark Felder f9e0c05ca4 Only run one attachment cleanup job per node
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
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
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
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
lain 294628d981 Merge branch 'feature/expire-mutes' into 'develop'
4 years ago