10da13c713
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
...
Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04 22:10:40 +03:00
8bd2b6eb13
temp hackney fix
2020-09-04 14:24:15 +03:00
ce387ce730
mix.exs: bump development version after 2.1.0 release
2020-08-28 16:15:57 +03:00
b141e35d64
Mix: Update version
2020-08-28 11:34:48 +02:00
49a436ad3e
Mix: Make rc version explicit.
2020-08-25 16:07:07 +02:00
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-25 15:38:12 +02:00
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
2020-08-07 16:45:33 +03:00
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
697e3db01c
Add analyze mix alias to run the same credo checks we use in CI
2020-08-04 08:55:40 -05:00
87180ff817
Fix ConnecitonPool deadlocking after reaching the connection limit
...
The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.
Closes #1977
2020-08-01 12:18:56 +03:00
56171cbde6
set versions
2020-07-30 09:23:35 +03:00
b261135683
updated `cors_plug`
2020-07-30 09:12:42 +03:00
aac7e0314e
set `postgrex` version
2020-07-30 09:08:50 +03:00
4f10ef5e46
set `web_push_encryption` version
2020-07-30 09:08:03 +03:00
df82839c30
updated `calendar` package
2020-07-30 08:58:19 +03:00
cd2423d7f5
update mogrify package
2020-07-29 09:22:49 +03:00
b4603a9c9c
set http_signatures version
2020-07-29 07:23:06 +03:00
d6e36aaf06
set `jason` version
2020-07-29 07:13:59 +03:00
88f57418c8
updated `pot` package
2020-07-29 07:02:36 +03:00
992a271196
updated the minor version packages
2020-07-29 07:00:27 +03:00
ed881247b7
set swoosh version
2020-07-29 06:50:00 +03:00
15b8446cdb
updated dev & test packages
2020-07-29 06:47:56 +03:00
3e5fb90eaa
locked earmark version
2020-07-28 07:00:02 +03:00
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
c8fe0321b0
mix.exs: Append .git to git repo URLs
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
2020-07-22 12:00:07 +02:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
5d263dfdb3
Update linkify to latest release
2020-07-20 09:29:03 -05:00
5701840d30
Use updated Linkify from git
2020-07-16 15:01:13 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
ebfa591689
Go back to upstream Tesla
2020-07-15 15:26:35 +03:00
6b1f6a1cf7
Bump gun
2020-07-15 15:26:35 +03:00
4128e3a84a
HTTP: Implement max request limits
2020-07-15 15:26:35 +03:00
e6ccc25565
Fix in-db configuration in dev environment
...
Previously, in-db configuration only worked when `warnings_as_errors`
was disabled because re-compiling scrubbers on application restart
created a warning about module conflicts. This patch fixes that
by enabling `ignore_module_conflict` option of the compiler at runtime,
and enables `warnings_as_errors` in prod since there is no reason
to keep it disabled anymore.
2020-07-14 13:16:54 +03:00
05187d497d
One can not simply call application modules from mix.exs
2020-07-11 16:09:46 +03:00
aedbbec88a
Add Pleroma.Utils.command_available?/1 and use where appropriate
2020-07-11 15:48:45 +03:00
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
2020-07-10 11:34:53 -05:00
d7a37fddd1
Switch to the official Oban 2.0.0 release
2020-07-10 11:33:08 -05:00
b6688030fa
prometheus update for OTP 23
2020-07-10 10:35:59 +03:00
4d3d867f10
Update Oban to 2.0-rc3
2020-07-03 10:37:07 -05:00
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
2020-07-03 10:36:41 -05:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
dc60b1ee58
updated swoosh
2020-06-29 16:27:01 +03:00
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
2020-06-24 09:12:32 +03:00
71e233268a
oban 2.0-rc2
2020-06-23 21:47:01 +03:00
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
6efd3730c3
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
...
mix.exs: version git-less (part 2, MacOS-compat)
See merge request pleroma/pleroma!2420
2020-06-20 16:22:01 +00:00
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
aca6a7543a
Upgrade to Elixir 1.9
2020-06-16 13:18:29 +00:00
ec1452fd1c
Pleroma.MIME: use gen_magic
2020-06-16 15:15:50 +02:00
9046f85ced
mix.exs: bump to 2.0.7
2020-06-12 21:09:28 +03:00
fe8cf54829
mix.exs: bump version to 2.0.6
2020-06-08 01:33:07 +03:00
0186f56d93
Update crypt library
2020-06-08 00:58:31 +03:00
512261c97d
Update crypt library
2020-05-19 14:46:06 +03:00
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
2020-05-13 10:53:56 -05:00
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
2906cbbd40
mix.exs: bump to 2.0.5
2020-05-13 00:33:38 +03:00
b5b675fa14
fix eldap being required for non-OTP releases
2020-05-12 23:05:31 +03:00
da2fe8920d
fix eldap being required for non-OTP releases
2020-05-12 23:03:21 +03:00
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
9c23955879
mix.exs: bump version to 2.0.4
2020-05-10 18:03:33 +03:00
a74c31ff63
include eldap in OTP releases
...
Closes #1313
2020-05-10 01:09:20 +03:00
b6d1bcc55d
include eldap in OTP releases
...
Closes #1313
2020-05-09 15:17:12 +03:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
04f23294d3
mix.exs: bump to 2.0.3
2020-05-02 19:16:27 +03:00
0d74e38f5f
mix.exs: Do not bail out when .git doesn’t exists
2020-05-01 00:55:37 +03:00
053c461530
mix.exs: proper check on 0, remove else in git_pre_release
2020-04-24 00:45:12 +02:00
c63d6ba0b2
mix.exs: branch_name fallbacks to ""
2020-04-23 23:44:30 +02:00
b429a49504
mix.exs: Fix for MacOS
2020-04-23 23:44:03 +02:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
2020-04-19 20:24:32 +02:00
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
648cc699e5
Merge branch 'develop' into support/update_oban
2020-04-10 07:09:28 +03:00
c2aad36aa8
Rename function
2020-04-09 23:19:41 +00:00
0e8f6d24b8
Create OTP_VERSION file by `mix release`
2020-04-10 00:22:50 +09:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
a674094ec6
mix.exs bump version to 2.0.2
2020-03-31 14:02:51 +03:00
0c010c292e
Merge branch 'fix/ecto_ssl_option' into 'develop'
...
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
2020-03-31 13:42:19 +03:00
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
4705590f76
Fix ssl option on Ecto config breaking release
...
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
2020-03-16 22:02:01 -03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +03:00
e3f26920d0
mix.exs: bump version to 2.0.1
2020-03-15 16:54:27 +03:00
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
86e7709a4d
mix.exs: bump version to development one
2020-03-08 23:24:30 +03:00
3508ae7039
version bump changelog and mix version
2020-03-05 22:35:23 +03:00
fe47bcde8c
updating tesla ref
2020-03-04 19:44:03 +03:00
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
85d571fc23
Move Tesla repo to our GitLab
2020-03-02 12:52:41 -06:00
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
c026128325
deps: update cachex to 3.2.0
2020-02-29 20:40:23 +03:00
3849bbb60d
temp using tesla from fork
2020-02-21 12:30:37 +03:00
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm
2020-02-14 19:09:41 +01:00
0b19fcdda1
Update ferd/recon, requested by @tk to support an AMPQ library he's
...
integrating with an MRF.
Upstream changelog:
2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)
2020-02-14 10:16:12 -06:00
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
2020-02-11 16:16:29 +03:00
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
33bd8fbffe
filename and test fixes
2020-01-28 18:02:11 +03:00
93b9f226e0
path fix
2020-01-28 16:32:33 +03:00
251bbd794a
Apply suggestion to mix.exs
2020-01-28 13:29:44 +00:00
aa3ba63513
like this
2020-01-28 15:41:45 +03:00
91ea3ed82c
moving restarter application into pleroma repo
2020-01-28 15:19:05 +03:00
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
e93cc561cd
restarting pleroma from outside application
2020-01-25 18:42:04 +03:00
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
520940d3e2
Update `captcha` dependency
2019-12-28 19:48:54 +07:00
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
469c0956cd
update excoveralls
2019-12-04 09:43:01 +03:00
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
d55859f5a4
remove `quantum` package
2019-11-27 16:35:12 +03:00
a4f834a687
moved DigestEmail to Oban Periodic jobs
2019-11-27 15:59:13 +03:00
bd1984f054
update tests and Oban
2019-11-26 15:24:34 -05:00
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
8ffd1c792c
Remove version mismatch warning
2019-11-21 18:22:18 +07:00
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
94627baa5c
New rate limiter
2019-11-11 12:13:06 +00:00
2f4e9a068f
Bump fast_sanitize to 0.1.1
...
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
2019-11-08 00:51:04 +03:00
9d3b12a658
Bump HtmlEntities to 0.5
...
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
2019-11-05 12:37:25 +03:00
203d9812f0
mix: update fast_sanitize dependency to 1af67547
2019-11-04 08:38:40 -06:00
f42f300870
update fast sanitize dependency
2019-11-03 15:41:30 -06:00
55ef88ef95
Bump fast_sanitize version
2019-11-01 20:58:24 +03:00
bd0f7f2e09
Bump fast_sanitize dependency so this builds on more than just Linux
2019-10-30 17:57:08 -05:00
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
77cfb08b8c
Remove commented-out code
2019-10-29 20:58:54 +03:00
61400d7eb7
Fix XSS emoji test
2019-10-29 20:49:32 +03:00
7358cf1f20
Bump fast_sanitize dependency
2019-10-29 17:00:03 +03:00
41c23251f1
Bump fast_sanitize version
2019-10-29 13:05:20 +03:00
9cde3321a3
Add fast_sanitize to dependencies
2019-10-29 01:21:00 +03:00
2453928b57
Ensure myhtmlex is started before swarm
...
Otherwise swarm is going to attempt resizing the cluster and timeout
2019-10-29 01:16:57 +03:00
f94e28e8b6
mix.exs: Bump version for develop builds
...
As per discussion on irc, we already used GNU-style versioning system
for release candidates, so it makes sense to use it for develop builds as well.
2019-10-19 22:00:35 +03:00
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
2f0ed5f6c4
Fix hiding branch name logic
2019-10-14 22:15:16 +03:00
17b8896c40
Correct version parser branch name detection
2019-10-14 18:45:16 +03:00
0e9243e8a2
Preparations for renaming `master` to `stable`
2019-10-14 18:38:51 +03:00
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
1d285e6fad
moving to separate dir
2019-09-19 14:02:27 +03:00
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
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
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
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
228bfd8a70
Bump elixir version to ~> 1.8
2019-09-17 22:36:42 +03:00
d201eec45c
fixed ecto version
2019-09-17 22:02:37 +03:00
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
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
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
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
b4cf74c106
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
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
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
69faec031d
markdown generation to the new file
2019-09-13 19:02:42 +03:00
6b0e8b73df
bump ex_doc version
2019-09-11 09:25:33 +03:00
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
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
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
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
9d78b3b281
mix: add ex_const dependency
2019-07-29 02:12:35 +00:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
2e697f87f4
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
2019-07-23 15:16:47 +00:00
afc7708dbe
Fix pleroma_job_queue version
2019-07-21 00:01:58 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
cdf0038d0f
mix: update http signatures dependency
2019-07-18 15:53:01 +00:00
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
2019-07-17 19:00:26 +00:00
e7c175c943
Use PleromaJobQueue for scheduling
2019-07-16 16:49:50 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
d302fcaa61
Dependencies: Update tzdata and related packages.
2019-07-15 16:47:39 +09:00
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
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
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
11143c542a
Remove `httpoison` from dependencies
2019-07-03 14:42:24 +07:00
rinpatch
Alexander Strizhakov
lain
Roman Chvanikov
Mark Felder
Maksim Pechnikov
Haelwenn (lanodan) Monnier
Alex Gleason
href
Steven Fuchs
Egor Kislitsyn
kPherox
Cevado
feld
Ivan Tashkinov
Ariadne Conill
Haelwenn
Maxim Filippov
oncletom
kaniini