Commit Graph

297 Commits

Author SHA1 Message Date
Alex S 1d285e6fad moving to separate dir 2019-09-19 14:02:27 +03:00
Haelwenn 5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop'
Improve generated docs formatting

See merge request pleroma/pleroma!1688
2019-09-18 15:31:03 +00:00
Haelwenn (lanodan) Monnier 4785596a2c
markdown.ex: end suggestions list with a newline
Otherwise we end up with suggestion on the same level as the childs

Markdown is a fuck…
2019-09-17 23:05:27 +02:00
rinpatch f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop'
Bump elixir version to ~> 1.8

See merge request pleroma/pleroma!1686
2019-09-17 20:09:26 +00:00
feld 764931fc9f Merge branch 'deps/update-tesla' into 'develop'
Update Tesla to 1.3

Closes #1262

See merge request pleroma/pleroma!1684
2019-09-17 19:37:29 +00:00
Maxim Filippov 228bfd8a70 Bump elixir version to ~> 1.8 2019-09-17 22:36:42 +03:00
Maksim Pechnikov d201eec45c fixed ecto version 2019-09-17 22:02:37 +03:00
rinpatch 8d812c28a7 Update Tesla to 1.3
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
2019-09-17 21:51:50 +03:00
rinpatch a21584556f Update oban to 0.8.1
This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam
2019-09-17 13:04:43 +03:00
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser

See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser 2019-09-15 14:53:58 +03:00
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	docs/config.md
2019-09-15 10:12:24 +03:00
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	docs/config.md
#	mix.lock
2019-09-14 16:11:44 +03:00
Alex S 69faec031d markdown generation to the new file 2019-09-13 19:02:42 +03:00
Alex S 6b0e8b73df bump ex_doc version 2019-09-11 09:25:33 +03:00
Alex S 511d93fa54 mix docs generates config.md 2019-09-11 09:25:33 +03:00
Ivan Tashkinov 581123f8bb [#1149] Introduced `quantum` job scheduler. Documentation & config changes. 2019-08-23 18:28:23 +03:00
Ivan Tashkinov c29686309e [#1149] Upgraded `oban` from 0.6.0 to 0.7.1. 2019-08-23 09:23:10 +03:00
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
rinpatch 6a101f0361 Switch to pre-1.8 version of tzdata.
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
2019-08-14 17:05:21 +03:00
Maksim bb9c539580 Uploader.S3 added support stream uploads 2019-08-10 11:27:59 +00:00
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
rinpatch 81412240e6 Fix Invalid SemVer version generation
when the current branch does not have commits ahead of tag/checked out on a tag
2019-08-01 14:15:18 +03:00
Ariadne Conill 9d78b3b281 mix: add ex_const dependency 2019-07-29 02:12:35 +00:00
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
oncletom 2e697f87f4 Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`. 2019-07-23 15:16:47 +00:00
Roman Chvanikov afc7708dbe Fix pleroma_job_queue version 2019-07-21 00:01:58 +03:00
Roman Chvanikov 36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
Ariadne Conill cdf0038d0f mix: update http signatures dependency 2019-07-18 15:53:01 +00:00
Ariadne Conill 1e3aff6ef1 mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989 2019-07-17 19:00:26 +00:00
Roman Chvanikov e7c175c943 Use PleromaJobQueue for scheduling 2019-07-16 16:49:50 +03:00
Roman Chvanikov 9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
lain d302fcaa61 Dependencies: Update tzdata and related packages. 2019-07-15 16:47:39 +09:00
Maksim fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00
Roman Chvanikov eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Maksim 12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini 4948117fcf Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
Alexander Strizhakov 4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
Egor Kislitsyn 11143c542a Remove `httpoison` from dependencies 2019-07-03 14:42:24 +07:00
Ivan Tashkinov a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring. 2019-07-02 09:04:59 +03:00
rinpatch bdc1592377 Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
This is needed because if we run with MIX_ENV=dev we will get a "+dev"
suffix to the version in the docs, but if we run with MIX_ENV=prod the
docs build will fail because ex_doc is dev-only dependency.
2019-06-29 14:28:26 +03:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
lain 456668b490 Merge branch 'release/1.0' into 'develop'
1.0 Release

See merge request pleroma/pleroma!1348
2019-06-28 15:29:44 +00:00
lain da17bdd87e BUMP OF CHICKEN
1.0
2019-06-28 17:15:44 +02:00
rinpatch 51760c84b9 Merge branch 'develop' into release-docs 2019-06-22 12:44:20 +03:00
rinpatch 8dbcff2fed Merge branch 'mix_sem_ver_version_fix' into 'develop'
Fixed mix version computed for underscore-containing branches

See merge request pleroma/pleroma!1314
2019-06-22 09:20:11 +00:00
William Pitcock 481932309f mix: update bbcode dependency to v0.1.1 2019-06-21 23:42:50 +00:00
Ivan Tashkinov 259ffe0062 Fixed branch name substitutions for mix version (to comply to SemVer format). 2019-06-21 17:19:29 +03:00
rinpatch 267f6bedd8 Formatting 2019-06-21 05:57:46 +03:00
rinpatch 7e35bdbd3c Copy the nginx config to the release directory 2019-06-21 05:46:47 +03:00
Ivan Tashkinov f07003e218 Fixed mix version computed for underscore-containing branches to be of SemVer format. 2019-06-20 17:54:16 +03:00
rinpatch ba584364e9 Merge branch 'feature/release-update-script' into 'develop'
pleroma_ctl: add an update command

Closes #1004 and #988

See merge request pleroma/pleroma!1305
2019-06-20 08:50:26 +00:00
rinpatch a6e3169cfc Make possible to override the branch name via a env variable
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
2019-06-19 14:40:39 +03:00
Alexander Strizhakov e4fa6b99ac aliases for mix tasks
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
rinpatch a0a1361888 Refactor pleroma_ctl copying to a generic function for copying files into the release dir 2019-06-19 03:52:03 +03:00
rinpatch f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00
rinpatch 57d54a9f09 Merge branch 'fix/991-version-generation' into 'develop'
version generation

Closes #991

See merge request pleroma/pleroma!1291
2019-06-16 10:18:47 +00:00
Alex S 451593f45e no print version to the shell 2019-06-16 11:48:15 +08:00
Mark Felder 2ad5a8511d Update Phoenix to 1.4.8 2019-06-15 07:03:26 -05:00
Alex S e02f22d779 bugfix 2019-06-15 16:36:13 +08:00
Alex S 501705438f little fix 2019-06-15 16:24:49 +08:00
Alex S baf58c1234 version generation 2019-06-15 12:02:21 +08:00
lain 315f090f59 Prometheus: Remove flaky process collection NIF. 2019-06-13 20:30:04 +02:00
Egor Kislitsyn bf22ed5fbd Update `auto_linker` dependency 2019-06-12 15:53:33 +07:00
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn 2e5affce61 Add RateLimiter 2019-06-11 14:27:41 +07:00
rinpatch c47dc0de2c Load ex_syslog and copy pleroma_ctl 2019-06-08 17:17:10 +03:00
Roman Chvanikov b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
lain b5e3b1e58a Mix: Swallow git error messages during version number handling.
Otherwise sometimes a 'fatal' message will be printed, confusing users.
2019-06-04 16:58:40 +02:00
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
kaniini f0516d9114 Merge branch 'ssh-fixes' into 'develop'
Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
2019-05-22 18:57:34 +00:00
lain f323031927 Mix: Only start sshd when needed, second try. 2019-05-22 12:57:20 +02:00
lain f4cfcead88 Mix: Bring ecto-sql back to mainline. 2019-05-22 11:44:17 +02:00
lain db9a82d168 Linting. 2019-05-22 10:40:15 +02:00
lain b6cf62ddea Mix: Don't start esshd application if we don't need it. 2019-05-22 10:28:50 +02:00
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update 2019-05-17 11:33:04 +02:00
lain 718b59a263 Dependencies: Update ecto sql once more. 2019-05-17 11:19:30 +02:00
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library

See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
feld f831acf912 Excoveralls for code coverage 2019-05-15 15:19:20 +00:00
lain 88cc423fa3 Dependencies: Update Ecto SQL. 2019-05-15 16:45:26 +02:00
William Pitcock 071f78733a switch to pleroma/http_signatures library 2019-05-14 20:03:13 +00:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
Roman Chvanikov f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
feld c953ae8c3d Initial bundle of basic AdminFE
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
Conversations once more.

See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
xse c81b707030 Fix/ex_doc source links 2019-05-07 00:32:07 +00:00
lain 4c76f49e60 BBS: small fixes. 2019-05-04 15:06:18 +02:00
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
lain a23206a4ae Just have Benchee in all environments. 2019-05-03 20:28:06 +02:00
lain a7709cc267 Mix: Also have benchee in test. 2019-05-03 19:42:49 +02:00
lain 0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain 81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
Egor Kislitsyn 04fd7cf817 Update `auto_linker` 2019-05-01 15:18:12 +07:00
Roman Chvanikov 0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
William Pitcock 2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00:00
Roman Chvanikov 724311e151 Fix Credo warnings 2019-04-20 19:57:43 +07:00
Roman Chvanikov 64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Roman Chvanikov 2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
rinpatch 37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Haelwenn 050339c223 Merge branch 'docs/changelog' into 'develop'
Add a changelog

See merge request pleroma/pleroma!1053
2019-04-13 20:29:05 +00:00
rinpatch 3a805cc35c Add a changelog 2019-04-13 00:31:18 +03:00
Egor f9af90c5aa Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
Mark Felder b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld 3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
href b655a8ea83 Add recon 2019-04-04 11:22:30 -05:00
Egor Kislitsyn d313a0c49c Update `auto_linker` dependency 2019-04-03 19:41:15 +07:00
Ivan Tashkinov eadafc88b8 [#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes. 2019-04-01 09:28:56 +03:00
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
lain 17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02:00
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue` 2019-03-29 12:46:05 +00:00
rinpatch dfae0050af Move out of Gitlab Wiki
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28 19:46:30 +03:00
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop'
Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
Ivan Tashkinov af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch 9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
link0ff 40c58d3383 Ignore compilation warnings for undefined module :eldap 2019-03-20 13:28:06 +02:00
Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier f5b54acc81
Fix headers and add !929 docs to extras
[ci skip]
2019-03-15 10:58:15 +01:00
Ivan Tashkinov 63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
William Pitcock e10ca35b3d mix: update dependencies for cowboy 2.0 2019-02-28 15:44:07 +00:00
Egor c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
William Pitcock 1c87102d01 mix: add timex dependency 2019-02-21 00:19:49 +00:00
lambda a2f4fc49fe Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
#   mix.exs
2019-02-17 17:39:45 +00:00
rinpatch ccd30a1875 Fix formating 2019-02-17 12:07:49 +03:00
rinpatch 006bec8c6a Add differences in MastoAPI responses to mix.exs extras 2019-02-17 10:34:00 +03:00
Haelwenn (lanodan) Monnier 25ab90edea
mix.exs: Add docs/Clients.md to docs.extras
[ci skip]
2019-02-16 19:39:03 +01:00
rinpatch e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
Haelwenn (lanodan) Monnier 5bcea0deca
Install ex_syslogger 2019-01-06 01:11:52 +01:00
Maxim Filippov 2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
Haelwenn (lanodan) Monnier 286632dfa2
Add docs/Admin-API.md
[ci skip]
2018-12-31 12:27:46 +01:00
Ivan Tashkinov d8fd6a1055 [#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version. 2018-12-27 16:32:47 +03:00
Ivan Tashkinov 58b12c09db [Fixes #396] Required Elixir ~> 1.7. 2018-12-27 16:12:33 +03:00
Haelwenn (lanodan) Monnier 6adea5a7b2
Move to docs 2018-12-18 17:16:26 +01:00
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex 2018-12-18 17:05:36 +01:00
raeno a300336459 Merge branch 'develop' into oembed_provider 2018-12-18 14:59:32 +01:00
Haelwenn (lanodan) Monnier 08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints 2018-12-18 13:58:34 +01:00
href ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged. 2018-12-17 17:28:03 +01:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00