Commit Graph

830 Commits (7f76700baf7493a1b1b312b92e33b0194573c746)

Author SHA1 Message Date
rinpatch dc9303eac5 Revert "Merge branch 'patch-1' into 'develop'"
5 years ago
Mark Felder edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
5 years ago
Mark Felder c65190c799 Console backend's log format should be prefixed and suffixed with newlines.
5 years ago
Mark Felder 1c17f18329 Be specific about format for logs in test as we have tests that check it
5 years ago
Mark Felder cb513a599c Allow test builds to have info and debug logs stripped
5 years ago
Mark Felder ff9133b978 Allow mix tasks to always run with debug logging
5 years ago
Ariadne Conill 1d33eeca72 config: add configuration for MRF ObjectAgePolicy
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
lain 72cc92259e Default config: Use extended nickname format
5 years ago
rinpatch 4499a7a075 Disable attachment links by default
5 years ago
lain e08bd99bab Apply suggestion to config/config.exs
5 years ago
lain 4885d403fe Apply suggestion to config/config.exs
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
Phil Hagelberg 886a07ba57 Move static_fe config to its own section instead of in :instance.
5 years ago
rinpatch 2f4e9a068f Bump fast_sanitize to 0.1.1
5 years ago
rinpatch 9434e151a9 Blacklist myhtmlex nodes from swarm
5 years ago
rinpatch 05d111b622 Use the default scrubber before mediaproxy transformation
5 years ago
KokaKiwi 638457ba94 MastoFE: Add PWA manifest.
5 years ago
rinpatch 5c6c3026ea Merge branch 'patch-1' into 'develop'
5 years ago
Ariadne Conill c6de0cbb4a config: disable Websub and Salmon publisher modules
5 years ago
yalh76 fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
5 years ago
lain ecd7ac855b Benchmark config: Don't use the sql sandbox.
5 years ago
lain 2629493804 Benchmark config: Database adjustments.
5 years ago
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain 02f8e2a8ab Gitlab: Run benchmark in CI.
5 years ago
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus
5 years ago
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Mark Felder b8b98ac40f Add missing extended_nickname_format setting to the default config
5 years ago
Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
minibikini f9380289eb Add `remote_ip` plug
5 years ago
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
5 years ago
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work.
5 years ago
Egor Kislitsyn d639cdcecb Update "config/description.exs"
5 years ago
Egor Kislitsyn cf3041220a Add support for `rel="ugc"`
5 years ago
Ekaterina Vaartis 3e972c0456 Add :shared_pack_cache_seconds_per_file to description.exs
5 years ago
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing
5 years ago
Ekaterina Vaartis 7e4c8b56ea Add tests for emoji pack sharing
5 years ago
Haelwenn (lanodan) Monnier 32d64102cb
description.exs: uncomment type for email logo
5 years ago
Haelwenn (lanodan) Monnier c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier 50ec445b2c
description.exs: remove empty strings and arrays
5 years ago
Haelwenn (lanodan) Monnier 35dcea3e13
Remove [true,false] for booleans, it is implicit
5 years ago
Ivan Tashkinov e7afb67c5c [#1260] Rate-limiting for create authentication and related requests.
5 years ago
Egor Kislitsyn d6ab78e610 Set `account_field_value_length` limit to 2048 by default
5 years ago
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
5 years ago
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
5 years ago
Steven Fuchs aab264db82 Streamer refactoring
5 years ago
Ivan Tashkinov e127b9ab6d [#1149] Rewritten readme as config/description.exs.
5 years ago
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
5 years ago
rinpatch 56828abf6d Use Jason for rendering responses
5 years ago
Alex S e47089cf55 web_cache_ttl description
5 years ago
Alex S 10827eecad formatting
5 years ago
Alexander Strizhakov 5db2920644 Apply suggestion to config/description.exs
5 years ago
Alexander Strizhakov 65bc9e66ad Apply suggestion to config/description.exs
5 years ago
Alex S 6721301086 some changes
5 years ago
Alex S 171cefd889 description.exs
5 years ago
minibikini 11e12b5761 Add Pleroma.Plugs.Cache
5 years ago
Alex S db690bede9 temp commit
5 years ago
Ivan Tashkinov 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ashlynn Anderson bd8b92ea5e Remove dynamic config as default, add healthcheck
5 years ago
Ivan Tashkinov b49085c156 [#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Ivan Tashkinov a90ea8ba15 [#1149] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn 66c1966688 Disable rate limiter by default
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov c34126f89c Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
aries e5f76a54e6 Fix default config of account fields length
5 years ago
Ivan Tashkinov 581123f8bb [#1149] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Ivan Tashkinov c29686309e [#1149] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Ivan Tashkinov 7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop'
5 years ago
Egor Kislitsyn 8d899d6197 Add `:ap_routes` rate limit
5 years ago
lain 8340fe8fcc Merge branch 'digest-template' into 'develop'
5 years ago
Egor Kislitsyn 158231cd20 Add configurable colors and logo for the digest template
5 years ago
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn a2e1db5632 Increase max account fields limits
5 years ago
Egor Kislitsyn e457fcc479 Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn 2c35d4b0b0 Add configurable account field name length limit
5 years ago
Egor Kislitsyn db3c05f6b4 Add configurable account field value length limit
5 years ago
Egor Kislitsyn e0ac5c7a66 Add custom profile fields
5 years ago
rinpatch 9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop'
5 years ago
rinpatch 83a3de8cc4 Merge branch 'length-limit-bio' into 'develop'
5 years ago
Ariadne Conill 3fdbeb7087 MRF: add vocabulary policy module
5 years ago
Ariadne Conill f46cd7e9c7 config: remove legacy activitypub accept_blocks setting
5 years ago
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop'
5 years ago
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set
5 years ago
Ashlynn Anderson 4007717534 Run mix format
5 years ago
Ashlynn Anderson 4a418698db Create docker.exs and docker-entrypoint + round out Dockerfile
5 years ago
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries.
5 years ago
Egor Kislitsyn 9ca4506355 Add configurable length limits for `User.bio` and `User.name`
5 years ago
rinpatch c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api
5 years ago
Mike Verdone 378f5f0fbe Add activity expiration worker
5 years ago
Mike Verdone b729402774 Make test.exs read config in the same way as dev.exs
5 years ago
rinpatch 196cad46f3 Resolve merge conflicts
5 years ago
Roman Chvanikov 36049f08ef Merge develop
5 years ago
kaniini 33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop'
5 years ago
Ariadne Conill 1345e0c2bf tests: add tests for signed object fetches
5 years ago
Ariadne Conill b2a8ccf37f config: add sign_object_fetches option
5 years ago
Alexander Strizhakov 10f82c88b8 mastoapi password reset
5 years ago
Sachin Joshi 18234cc44e add the rich media ttl based on image exp time
5 years ago
Ivan Tashkinov 889dc17abd [#1094] Rate-limited follow & unfollow actions.
5 years ago
Roman Chvanikov c729883936 Merge branch 'develop' into feature/digest-email
5 years ago
Alex S f4447d82b8 parsers configurable
5 years ago
Ariadne Conill 80c46d6d8b nodeinfo: implement MRF transparency exclusions
5 years ago
rinpatch e8fa477793 Refactor Follows/Followers counter syncronization
5 years ago
kaniini f4c001062e Merge branch '1041-status-actions-rate-limit' into 'develop'
5 years ago
Ivan Tashkinov 369e9bb42f [#1041] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch fa7e0c4262 Workaround for remote server certificate chain issues
5 years ago
Roman Chvanikov eae991b06a merge develop
5 years ago
Eugenij 4198c3ac39 Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Alex S 59e16fc45a enable synchronization by default
5 years ago
Alex S beba7bbc85 removing synchronization worker
5 years ago
Maksim 12b1454245 [#1062] added option to disable send email
5 years ago
Roman Chvanikov 371d39e160 Merge develop
5 years ago
Alexander Strizhakov d6b0fce6e9 Fix/1019 correct count remote users
5 years ago
Alexander Strizhakov 4e6e5d8042 reverse proxy tests
5 years ago
Haelwenn 1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop'
5 years ago
Haelwenn 95c085174d Merge branch 'test-speedup' into 'develop'
5 years ago
lain abe2e8881f Testing: Don't federate in testing.
5 years ago
rinpatch 682f1897b7 Enable OpenGraph and TwitterCard by default
5 years ago
Ivan Tashkinov 2b9d914089 [#161] Refactoring, documentation.
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
Mark Felder f8ec3e129f In my experience syslog tags are usually lowercase
5 years ago
kaniini 9f8e645dce Merge branch 'feature/configurable-pack-extensions' into 'develop'
5 years ago
rinpatch 41e4752950 Make default pack extensions configurable and default to png and gif
5 years ago
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media
5 years ago
rinpatch 875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default
5 years ago
Alexander Strizhakov 32320c1ee9 Fixes for dynamic configuration
5 years ago
rinpatch f30a3241d2 Deps: Update auto_linker
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
Egor Kislitsyn ce823fa88e Fix rate limit test
5 years ago
rinpatch ac3d43e620 Set instance static/uploads to be outside of application directory in release config
5 years ago
lain 822a9f28d0 Merge branch 'release-config-import' into 'develop'
5 years ago
rinpatch f0d96534a4 Import release config from env variable or /etc/pleroma/config.exs and
5 years ago
Egor Kislitsyn 6f29865d43 Add option to restrict all users to local content
5 years ago
Hakaba Hitoyo 5d5a9a3a35 Better default parameters for suggestion
5 years ago
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn ad04d12de6 Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn bc8f059367 Add rate limiting for search endpoints
5 years ago
kaniini e343e4ff91 Merge branch 'change-containment-default' into 'develop'
5 years ago
rinpatch 3ecfe2a6d4 Merge branch 'develop' into feature/releases
5 years ago
rinpatch b6d2db42a7 Fix wrong placement of serve_endpoints
5 years ago
rinpatch 4f5149c93b Set default loglevel to `warn` in prod
5 years ago
rinpatch 4b98a7ce4e Set serve_endpoints to true in prod config as setting it in runtime
5 years ago
rinpatch 3d374bf7df Basic release skeleton
5 years ago
lain 76fc4c92bb Fix tests.
5 years ago
lain 593b8b1e6a Configuration: Skip thread containment by default
5 years ago
Roman Chvanikov c0fa000147 Set default config for digest to false
5 years ago
Roman Chvanikov 01fe5abad1 Resolve conflicts
5 years ago
rinpatch 92213fb87c Replace Mix.env with Pleroma.Config.get(:env)
5 years ago
Egor f82382de22 [#943] Make the unauthenticated users limitation optional
5 years ago
Ivan Tashkinov 3eefb274f4 OAuth consumer: tests fix, comments, Keycloak config notes.
5 years ago
Roman Chvanikov b1b1a270e8 Fix conflict
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
5 years ago
kaniini a536f515dd Merge branch 'ueberauth_config_extension' into 'develop'
5 years ago
Roman Chvanikov bd325132ca Fix tests
5 years ago
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov 080e1aa70e add option skip_thread_containment
5 years ago
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
William Pitcock 561a21986d formatting
5 years ago
William Pitcock 4087ccdab8 mrf: add subchain policy
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
Haelwenn f1890d2cac Merge branch 'dokku' into 'develop'
5 years ago
lain 4e45f7bc87 CI: Add auto-deployment via dokku.
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants
5 years ago
William Pitcock 80d55d428f tests: websub: check only that signature validation succeeds or fails
5 years ago
William Pitcock 9bec891eb4 kill @httpoison
5 years ago
William Pitcock baf72d6c58 mrf: simple policy: add the ability to strip avatars and banners from user profiles
5 years ago
Maksim 620908a2db [#699] add worker to clean expired oauth tokens
5 years ago
lambda 714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop'
5 years ago
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
5 years ago
William Pitcock 16b260fb19 add mix task to prune the object database using a configured retention period
5 years ago
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state
5 years ago
Mark Felder 75c7bb9289 Additional reserved usernames
5 years ago
Sadposter daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy
5 years ago
William Pitcock 290f5b2cfe config: make sending the user agent configurable, disable sending the user agent in tests
5 years ago
lain 8784a7d1b4 RUM: Set rum status by the environment.
5 years ago
lain 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
lain e39c190f04 Configuration: disable migration lock.
5 years ago
Alex S aa11fa4864 add report uri and report to
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
lambda 0992094bd6 Merge branch 'cleanup' into 'develop'
5 years ago
lain f1e67bdc31 Search: Add optional rum indexing / searching.
5 years ago
rinpatch 153c15cdb2 Merge branch 'legacy-fe-config' into 'develop'
5 years ago
Sachin Joshi ee22fff5ac remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn 6c9f45f4dd Remove unused queue from the config
5 years ago
rinpatch 2ca8d20053 Fix rate-limiting tests
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
rinpatch 38f3393e93 Make rate limiting for Mastodon Registration API less agressive and enable it by default.
5 years ago
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
lambda b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop'
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
William Pitcock fedaca15a3 websub: adapt to work as a federator publishing module
5 years ago
William Pitcock 179293e51c salmon: refactor to work as a federator publishing module
5 years ago
William Pitcock 10695a28d2 federator: publisher: add publish() wrapper
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alex S f46295faa7 unused config paramater
5 years ago
Maksim 1040caf096 fix format
5 years ago
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop'
5 years ago
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
Roman Chvanikov 0f0cc2703b Merge develop
5 years ago
William Pitcock 501af917b5 add support for bbcode
5 years ago
Mark Felder 24c3e2db2c Add mediaproxy whitelist capability
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
5 years ago
Alex S d35246c449 added healthcheck setting to instance config
5 years ago
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Ekaterina Vaartis 0d6265cfe2 Change the default manifest to pleroma's namespace
5 years ago
Roman Chvanikov b87ad13803 Move comments for email_notifications config to docs
5 years ago
Roman Chvanikov 64a2c6a041 Digest emails
6 years ago
Ekaterina Vaartis 8f93d4c423 Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis 9bd5e2dec9 Make emoji default_manifest a config option
6 years ago
Ekaterina Vaartis a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode
6 years ago
Ekaterina Vaartis c26724cc55 Remove finmoji and add a way to download emojis in packs
6 years ago
Roman Chvanikov 73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov aeafa0b2ef Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov ada384207b typo fix
6 years ago
Roman Chvanikov 2f0203a4a1 Resolve conflicts
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop'
6 years ago
Hakurei Reimu 10096bbf2b add extra_cookie_attrs option to config
6 years ago
lain 4fecd6f9a7 Config.exs: Add big warning so that nobody ever edits it.
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Alex S fe13a1d78c adding notify_email setting for trigger emails
6 years ago
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
6 years ago
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
6 years ago
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
6 years ago
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn a1a854646e Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
6 years ago
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
Alex S 7410aee886 Merge develop to 770-add-emoji-tags
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus
6 years ago
feld 3b12eeda19 Add ability to ship logs to a Slack channel
6 years ago
Mark Felder 7222afe01b Clean merge crumbs
6 years ago
href 7e930559fe Serve metrics at `/api/pleroma/app_metrics`
6 years ago
Egor Kislitsyn 0b5c818cb7 [#1] fix telemetry
6 years ago
href bc3618a38d Set up telemetry and prometheus
6 years ago
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Alex S 9e0567ec52 Merge develop into feature/770-add-emoji-tags
6 years ago
Ivan Tashkinov 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Alex S 08d64b977f little changes and typos
6 years ago
Alex S 9b2188da7c refactoring of emoji tags config to use groups
6 years ago
Alex S 3601f03147 Adding tag to emoji ets table
6 years ago
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Mark Felder d5a1e08bf1 Add default mail adapter settings to config
6 years ago
lain 10fdc080a0 BBS: Tests and formatting.
6 years ago
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring.
6 years ago
kaniini 1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
6 years ago
lain 8468f3f6d4 Add safe dm mode option.
6 years ago
Ivan Tashkinov 81bf6d9e6a [#923] Typo fix.
6 years ago
Ivan Tashkinov af68a42ef7 [#923] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch 9a7b817c9a Ecto 3.0.5 migration
6 years ago
Ivan Tashkinov 26b6354095 [#923] Support for multiple (external) registrations per user via Registration.
6 years ago
Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
kaniini 8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
6 years ago
Ivan Tashkinov 2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
rinpatch 28cfb2c37a Enable dedupe by default
6 years ago
rinpatch e2fe796c63 Add some tests
6 years ago
link0ff 54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
link0ff 9338f061a3 Support LDAP method start_tls
6 years ago
Ivan Tashkinov 63ab61ed3f Sign in via Twitter (WIP).
6 years ago
kaniini 46200d8fac Merge branch 'fix-tlsv1.3' into 'develop'
6 years ago
Ekaterina Vaartis 5021b7836f Fetch user's outbox posts on first federation with that user
6 years ago
Maksim bc7570c282 [#647] tests for web push
6 years ago
Haelwenn (lanodan) Monnier a283a1fcd0
Add default config for masto_fe
6 years ago
Egor Kislitsyn eb84de0143 allow users to disable their own account
6 years ago
KokaKiwi b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy.
6 years ago
link0ff 19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
William Pitcock 6b2a1ad1c8 config: fix chat endpoint path
6 years ago
William Pitcock 9aec00d711 config: update config for cowboy 2 endpoints
6 years ago
Egor c3ac9424d2 AutoLinker
6 years ago
link0ff e278d47023 OpenLDAP support
6 years ago
Egor bff9eb5ef7 Reports
6 years ago
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop'
6 years ago
lain d812a347ca Add optional welcome message.
6 years ago
Karen Konou d943c90249 Add tests, change default config values, fix a bug
6 years ago
Haelwenn (lanodan) Monnier 71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
6 years ago
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch 2174f6eb4f Add default config for keyword policy
6 years ago
Michael Loftis 43b3f9e96e rids the duplicate timestamp from default ExSyslogger config
6 years ago
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch 89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop'
6 years ago
Karen Konou 0ef0ae35ab added optional delist feature
6 years ago
lain e61f0be951 Unbreak all the tests.
6 years ago
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
6 years ago
rinpatch 7057891db6 Make rich media support toggleable
6 years ago
Egor Kislitsyn d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
href 4aff4efa8d
Use multiple hackney pools
6 years ago
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
6 years ago
Egor Kislitsyn 55affbca7f add a job queue
6 years ago
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance.
6 years ago
lain 39b2457734 Change default bg image in new config.
6 years ago
Ivan Tashkinov 656ed7c84a [#534] Configurable outgoing federation reachability timeout.
6 years ago
lain e221c681dc New frontend configuration mechanism.
6 years ago
rinpatch 74346a7035 Fix merge conflict
6 years ago
rinpatch a38f21f51d unfurl_nsfw: false by default
6 years ago
Mark Felder 207489aa25 Also add to default config
6 years ago
rinpatch 76f80940da oops
6 years ago
rinpatch ff6c9a5c96 Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
rinpatch e4dc3f71ae Resolve merge conflict
6 years ago
kaniini 7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop'
6 years ago
Mark Felder 5419b1a030 Alpha sort the restricted nicknames
6 years ago
Egor Kislitsyn 28afcb7c31 move defaults from sample_config.exs to config.exs
6 years ago
lain 0fae04c4e3 Add a setting for users to autofollow on sign up.
6 years ago
Haelwenn (lanodan) Monnier c9b99d4486
config/config.exs: Add syslog backends
6 years ago
href 53f56039e5
Remove media proxy examples in config/config.exs
6 years ago
rinpatch b73a1a33de Merge branch 'captcha' into 'develop'
6 years ago
rinpatch 9ef664ffce Merge branch 'fix-chat' into 'develop'
6 years ago
rinpatch d1983ed028 Merge branch 'fix/reserve-media-username' into 'develop'
6 years ago
Rin Toshaka 5142b50f39 reserve /media
6 years ago
lain 8910e103ce Add handler for Phoenix-style socket.
6 years ago
lain 400337b0a7 Make Federator options configurable.
6 years ago
kaniini 3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
6 years ago
lambda 9c782e59dd Raise remote limit
6 years ago
Ekaterina Vaartis 448af3601a Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
lain 1dd71026a1 Add 'about' to restricted list.
6 years ago
lain 8da2c45c27 Add ~ to the list of restricted names.
6 years ago
lain 5811e65e67 Add some hard limits on inserted activities.
6 years ago
lain 91724d160a Reserve a few user names
6 years ago
Karen Konou c76179419d Renamed the things
6 years ago
Karen Konou 409ff60bf8 Fix formatting
6 years ago
Karen Konou 92362e1e22 Implement large thread filter
6 years ago
Ekaterina Vaartis d112990776 Specifically disable captcha for automatic tests, it makes them fail
6 years ago
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless
6 years ago
kaniini fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop'
6 years ago