Commit Graph

493 Commits (46c270ead83de020bedad95c4e40004fae45cd28)

Author SHA1 Message Date
rinpatch da2fe8920d fix eldap being required for non-OTP releases
4 years ago
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
rinpatch 9c23955879 mix.exs: bump version to 2.0.4
4 years ago
rinpatch a74c31ff63 include eldap in OTP releases
4 years ago
rinpatch b6d1bcc55d include eldap in OTP releases
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
rinpatch 04f23294d3 mix.exs: bump to 2.0.3
4 years ago
Haelwenn (lanodan) Monnier 0d74e38f5f mix.exs: Do not bail out when .git doesn’t exists
4 years ago
Haelwenn (lanodan) Monnier 053c461530
mix.exs: proper check on 0, remove else in git_pre_release
4 years ago
Haelwenn (lanodan) Monnier c63d6ba0b2
mix.exs: branch_name fallbacks to ""
4 years ago
Haelwenn (lanodan) Monnier b429a49504
mix.exs: Fix for MacOS
4 years ago
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account
4 years ago
Haelwenn (lanodan) Monnier c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
4 years ago
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag
4 years ago
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses
5 years ago
Maksim Pechnikov 648cc699e5 Merge branch 'develop' into support/update_oban
5 years ago
kPherox c2aad36aa8 Rename function
5 years ago
kPherox 0e8f6d24b8
Create OTP_VERSION file by `mix release`
5 years ago
lain d2e21fbc96 Merge branch 'open-api' into 'develop'
5 years ago
Maksim Pechnikov 591f7015d9 update Oban package
5 years ago
Egor Kislitsyn 23219e6fb3
Add OpenAPI
5 years ago
rinpatch a674094ec6 mix.exs bump version to 2.0.2
5 years ago
rinpatch 0c010c292e Merge branch 'fix/ecto_ssl_option' into 'develop'
5 years ago
Alexander Strizhakov 1fcdcb12a7
updating gun with bug fix
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Cevado 4705590f76 Fix ssl option on Ecto config breaking release
5 years ago
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier 5f9fbd7d33 Formatting: Do not use \n and prefer <br> instead
5 years ago
rinpatch e3f26920d0 mix.exs: bump version to 2.0.1
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun
5 years ago
rinpatch 86e7709a4d mix.exs: bump version to development one
5 years ago
rinpatch 3508ae7039 version bump changelog and mix version
5 years ago
Alexander Strizhakov fe47bcde8c
updating tesla ref
5 years ago
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
5 years ago
Mark Felder 85d571fc23 Move Tesla repo to our GitLab
5 years ago
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
rinpatch c026128325 deps: update cachex to 3.2.0
5 years ago
Alexander Strizhakov 3849bbb60d
temp using tesla from fork
5 years ago
Mark Felder cf94349287 Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 514c899275
adding gun adapter
5 years ago
rinpatch 472132215e Use floki's new APIs for parsing fragments
5 years ago
Haelwenn (lanodan) Monnier 04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm
5 years ago
Mark Felder 0b19fcdda1 Update ferd/recon, requested by @tk to support an AMPQ library he's
5 years ago
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
5 years ago
rinpatch 9172540f8d deps: update floki to 0.25.0
5 years ago
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
5 years ago
rinpatch 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
5 years ago
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383
5 years ago
Alexander Strizhakov 33bd8fbffe
filename and test fixes
5 years ago
Alexander Strizhakov 93b9f226e0
path fix
5 years ago
Alexander Strizhakov 251bbd794a Apply suggestion to mix.exs
5 years ago
Alexander Strizhakov aa3ba63513
like this
5 years ago
Alexander Strizhakov 91ea3ed82c
moving restarter application into pleroma repo
5 years ago
Maksim Pechnikov 02c3dd2e3d update ecto
5 years ago
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn 520940d3e2
Update `captcha` dependency
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn e536796984 Add native captcha and enable it by default.
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 469c0956cd update excoveralls
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov d55859f5a4 remove `quantum` package
5 years ago
Maksim Pechnikov a4f834a687 moved DigestEmail to Oban Periodic jobs
5 years ago
stwf bd1984f054 update tests and Oban
5 years ago
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Egor Kislitsyn 8ffd1c792c
Remove version mismatch warning
5 years ago
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
rinpatch 2f4e9a068f Bump fast_sanitize to 0.1.1
5 years ago
rinpatch 9d3b12a658 Bump HtmlEntities to 0.5
5 years ago
Ariadne Conill 203d9812f0 mix: update fast_sanitize dependency to 1af67547
5 years ago
Ariadne Conill f42f300870 update fast sanitize dependency
5 years ago
rinpatch 55ef88ef95 Bump fast_sanitize version
5 years ago
Mark Felder bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux
5 years ago
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex
5 years ago
rinpatch 77cfb08b8c Remove commented-out code
5 years ago
rinpatch 61400d7eb7 Fix XSS emoji test
5 years ago
rinpatch 7358cf1f20 Bump fast_sanitize dependency
5 years ago
rinpatch 41c23251f1 Bump fast_sanitize version
5 years ago
rinpatch 9cde3321a3 Add fast_sanitize to dependencies
5 years ago
rinpatch 2453928b57 Ensure myhtmlex is started before swarm
5 years ago
rinpatch f94e28e8b6 mix.exs: Bump version for develop builds
5 years ago
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
5 years ago
rinpatch 2f0ed5f6c4 Fix hiding branch name logic
5 years ago
rinpatch 17b8896c40 Correct version parser branch name detection
5 years ago
rinpatch 0e9243e8a2 Preparations for renaming `master` to `stable`
5 years ago
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
minibikini f9380289eb Add `remote_ip` plug
5 years ago
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
5 years ago
Egor Kislitsyn b5dfe83433 Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Alex S 1d285e6fad moving to separate dir
5 years ago
Haelwenn 5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 4785596a2c
markdown.ex: end suggestions list with a newline
5 years ago
rinpatch f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop'
5 years ago
feld 764931fc9f Merge branch 'deps/update-tesla' into 'develop'
5 years ago
Maxim Filippov 228bfd8a70 Bump elixir version to ~> 1.8
5 years ago
Maksim Pechnikov d201eec45c fixed ecto version
5 years ago
rinpatch 8d812c28a7 Update Tesla to 1.3
5 years ago
rinpatch a21584556f Update oban to 0.8.1
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
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop'
5 years ago
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser
5 years ago
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Alex S 69faec031d markdown generation to the new file
5 years ago
Alex S 6b0e8b73df bump ex_doc version
5 years ago
Alex S 511d93fa54 mix docs generates config.md
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 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 6a101f0361 Switch to pre-1.8 version of tzdata.
5 years ago
Maksim bb9c539580 Uploader.S3 added support stream uploads
5 years ago
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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
rinpatch 81412240e6 Fix Invalid SemVer version generation
5 years ago
Ariadne Conill 9d78b3b281 mix: add ex_const dependency
5 years ago
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email
5 years ago
oncletom 2e697f87f4 Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
5 years ago
Roman Chvanikov afc7708dbe Fix pleroma_job_queue version
5 years ago
Roman Chvanikov 36049f08ef Merge develop
5 years ago
Ariadne Conill cdf0038d0f mix: update http signatures dependency
5 years ago
Ariadne Conill 1e3aff6ef1 mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
5 years ago
Roman Chvanikov e7c175c943 Use PleromaJobQueue for scheduling
5 years ago
Roman Chvanikov 9bca70b10a Merge develop
5 years ago
lain d302fcaa61 Dependencies: Update tzdata and related packages.
5 years ago
Maksim fa17879c20 added tests for Web.MediaProxy
5 years ago
Roman Chvanikov eae991b06a merge develop
5 years ago
Maksim 12b1454245 [#1062] added option to disable send email
5 years ago
Roman Chvanikov 371d39e160 Merge develop
5 years ago
kaniini 4948117fcf Merge branch 'remove-swift' into 'develop'
5 years ago
Alexander Strizhakov 4e6e5d8042 reverse proxy tests
5 years ago
Egor Kislitsyn 11143c542a Remove `httpoison` from dependencies
5 years ago
Ivan Tashkinov a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring.
5 years ago
rinpatch bdc1592377 Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
lain 456668b490 Merge branch 'release/1.0' into 'develop'
5 years ago
lain da17bdd87e BUMP OF CHICKEN
5 years ago
rinpatch 51760c84b9 Merge branch 'develop' into release-docs
5 years ago
rinpatch 8dbcff2fed Merge branch 'mix_sem_ver_version_fix' into 'develop'
5 years ago
William Pitcock 481932309f mix: update bbcode dependency to v0.1.1
5 years ago
Ivan Tashkinov 259ffe0062 Fixed branch name substitutions for mix version (to comply to SemVer format).
5 years ago
rinpatch 267f6bedd8 Formatting
5 years ago
rinpatch 7e35bdbd3c Copy the nginx config to the release directory
5 years ago
Ivan Tashkinov f07003e218 Fixed mix version computed for underscore-containing branches to be of SemVer format.
5 years ago
rinpatch ba584364e9 Merge branch 'feature/release-update-script' into 'develop'
5 years ago
rinpatch a6e3169cfc Make possible to override the branch name via a env variable
5 years ago
Alexander Strizhakov e4fa6b99ac aliases for mix tasks
5 years ago
rinpatch a0a1361888 Refactor pleroma_ctl copying to a generic function for copying files into the release dir
5 years ago
rinpatch f30a3241d2 Deps: Update auto_linker
5 years ago
rinpatch 57d54a9f09 Merge branch 'fix/991-version-generation' into 'develop'
5 years ago
Alex S 451593f45e no print version to the shell
5 years ago
Mark Felder 2ad5a8511d Update Phoenix to 1.4.8
5 years ago
Alex S e02f22d779 bugfix
5 years ago
Alex S 501705438f little fix
5 years ago
Alex S baf58c1234 version generation
5 years ago
lain 315f090f59 Prometheus: Remove flaky process collection NIF.
5 years ago
Egor Kislitsyn bf22ed5fbd Update `auto_linker` dependency
5 years ago
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn 2e5affce61 Add RateLimiter
5 years ago
rinpatch c47dc0de2c Load ex_syslog and copy pleroma_ctl
5 years ago
Roman Chvanikov b1b1a270e8 Fix conflict
5 years ago
lain b5e3b1e58a Mix: Swallow git error messages during version number handling.
5 years ago
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
Roman Chvanikov ce47017c89 Merge develop
5 years ago
kaniini f0516d9114 Merge branch 'ssh-fixes' into 'develop'
5 years ago
lain f323031927 Mix: Only start sshd when needed, second try.
5 years ago
lain f4cfcead88 Mix: Bring ecto-sql back to mainline.
5 years ago
lain db9a82d168 Linting.
5 years ago
lain b6cf62ddea Mix: Don't start esshd application if we don't need it.
5 years ago
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
lain 718b59a263 Dependencies: Update ecto sql once more.
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
feld f831acf912 Excoveralls for code coverage
5 years ago
lain 88cc423fa3 Dependencies: Update Ecto SQL.
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
Roman Chvanikov f1f7a11222 Merge develop
5 years ago
feld c953ae8c3d Initial bundle of basic AdminFE
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
xse c81b707030 Fix/ex_doc source links
5 years ago
lain 4c76f49e60 BBS: small fixes.
5 years ago
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
lain a23206a4ae Just have Benchee in all environments.
5 years ago
lain a7709cc267 Mix: Also have benchee in test.
5 years ago
lain 0e37fddd5a Search: Add fts index on objects table.
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
Egor Kislitsyn 04fd7cf817 Update `auto_linker`
5 years ago
Roman Chvanikov 0f0cc2703b Merge develop
5 years ago
William Pitcock 2bd880be88 mix: add bbcode dependency
5 years ago
Roman Chvanikov 724311e151 Fix Credo warnings
5 years ago
Roman Chvanikov 64a2c6a041 Digest emails
5 years ago
Roman Chvanikov 2f0203a4a1 Resolve conflicts
6 years ago
rinpatch 37da03499e Bump ex_doc
6 years ago
Haelwenn 050339c223 Merge branch 'docs/changelog' into 'develop'
6 years ago
rinpatch 3a805cc35c Add a changelog
6 years ago
Egor f9af90c5aa Revert "simplify mentions escape"
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Mark Felder b395aebf24 Pin recon dependency to 2.4.0
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
href b655a8ea83 Add recon
6 years ago
Egor Kislitsyn d313a0c49c Update `auto_linker` dependency
6 years ago
Ivan Tashkinov eadafc88b8 [#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lain 17ab9fa45b BBS: Some more functionality.
6 years ago
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
rinpatch dfae0050af Move out of Gitlab Wiki
6 years ago
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop'
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
link0ff 40c58d3383 Ignore compilation warnings for undefined module :eldap
6 years ago
Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Haelwenn (lanodan) Monnier f5b54acc81
Fix headers and add !929 docs to extras
6 years ago
Ivan Tashkinov 63ab61ed3f Sign in via Twitter (WIP).
6 years ago
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts)
6 years ago
William Pitcock e10ca35b3d mix: update dependencies for cowboy 2.0
6 years ago
Egor c3ac9424d2 AutoLinker
6 years ago
William Pitcock 1c87102d01 mix: add timex dependency
6 years ago
lambda a2f4fc49fe Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
6 years ago
rinpatch ccd30a1875 Fix formating
6 years ago
rinpatch 006bec8c6a Add differences in MastoAPI responses to mix.exs extras
6 years ago
Haelwenn (lanodan) Monnier 25ab90edea
mix.exs: Add docs/Clients.md to docs.extras
6 years ago
rinpatch e4dc3f71ae Resolve merge conflict
6 years ago
Haelwenn (lanodan) Monnier 5bcea0deca
Install ex_syslogger
6 years ago
Maxim Filippov 2aab4e03c3 Add OGP parser
6 years ago
Haelwenn (lanodan) Monnier 286632dfa2
Add docs/Admin-API.md
6 years ago
Ivan Tashkinov d8fd6a1055 [#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version.
6 years ago
Ivan Tashkinov 58b12c09db [Fixes #396] Required Elixir ~> 1.7.
6 years ago
Haelwenn (lanodan) Monnier 6adea5a7b2
Move to docs
6 years ago
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
raeno a300336459 Merge branch 'develop' into oembed_provider
6 years ago
Haelwenn (lanodan) Monnier 08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
6 years ago
href ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
6 years ago
href b12a904911
Integration tests for mastodon websocket
6 years ago
href f672555ad3
Upgrade to Phoenix 1.4
6 years ago
lambda 7281ab0b3c Merge branch 'tests-warning-as-errors' into 'develop'
6 years ago
raeno b0c3211984 Scrub html from activity.content or user.bio for opengraph meta
6 years ago
href 0ee51992a8
Enable warning_as_errors for tests
6 years ago