f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
ec1452fd1c
Pleroma.MIME: use gen_magic
2020-06-16 15:15:50 +02:00
d2a1975e56
mix.lock: update hackney to 1.16.0
...
Closes #1612
2020-05-30 00:18:17 +03:00
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
1871a5ddb4
[ #2497 ] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
2020-05-20 20:26:43 +03:00
48bcb22146
Merge branch 'recipients-query-speedup' into 'develop'
...
Greatly speed up recipients query
See merge request pleroma/pleroma!2558
2020-05-19 14:32:27 +00:00
a985bd57b4
User.Query: Speed up recipients query.
2020-05-19 14:11:32 +02:00
512261c97d
Update crypt library
2020-05-19 14:46:06 +03:00
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-05-14 20:19:56 +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
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
2020-05-11 23:21:53 +03:00
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
9c3c142c32
Restore mix.lock after 2FA merge
...
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
2020-05-07 14:35:29 +03:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
4b00eb93fe
fix for syslog compile with updated rebar3
2020-05-06 18:04:16 +03:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +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
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
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
acb016397e
mix.lock: [minor] last hash appended
2020-03-15 20:44:04 +01: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
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +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
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +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
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
c026128325
deps: update cachex to 3.2.0
2020-02-29 20:40:23 +03:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +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
81cc9dd085
Merge branch 'develop' into chore/floki-update
2020-02-17 14:13:05 -06:00
7df13e6f3a
Update plug_crypto
2020-02-17 11:41:14 +01:00
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
a4a90ae422
Update all dependencies
...
Upgraded:
db_connection 2.2.0 => 2.2.1
earmark 1.4.2 => 1.4.3
ecto 3.3.1 => 3.3.3
ecto_sql 3.3.2 => 3.3.4
esshd 0.1.0 => 0.1.1
ex_doc 0.21.2 => 0.21.3
excoveralls 0.12.1 => 0.12.2
gettext 0.17.1 => 0.17.4
html_entities 0.5.0 => 0.5.1
httpoison 1.6.1 => 1.6.2
joken 2.1.0 => 2.2.0
jose 1.9.0 => 1.10.1
nimble_parsec 0.5.1 => 0.5.3
phoenix 1.4.10 => 1.4.13
phoenix_ecto 4.0.0 => 4.1.0
phoenix_html 2.13.3 => 2.14.0
plug_cowboy 2.1.0 => 2.1.2
plug_crypto 1.1.0 => 1.1.1
prometheus 4.4.1 => 4.5.0
tesla 1.3.0 => 1.3.2
2020-02-14 19:16:22 +01: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
070069125f
deps: update back fast sanitize
...
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
2020-02-13 19:48:22 +03:00
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
58299fcfb4
deps: update fast_sanitize to 0.1.7
...
needed to get new fast_html version since 1.0.1 had an attribute parsing
bug
2020-02-11 16:17:03 +03:00
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
2020-02-11 16:16:29 +03:00
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
f57cea17bc
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
2020-02-07 18:38:36 +03:00
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
205e73058d
mix.lock: update mock to 0.3.4
...
This version adds Mock.passthrough/1 which I need to use in a test
2020-01-19 13:42:52 +03: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
c01b39579d
mix.lock: update fast_sanitize
...
the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.
2019-12-11 20:44:45 +03:00
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
469c0956cd
update excoveralls
2019-12-04 09:43:01 +03:00
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
cf52106e05
Update Floki dependency
2019-12-02 13:38:35 +07: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
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
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-18 20:43:19 +03:00
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
fad296e432
Bump fast_sanitize
2019-11-16 19:19:25 +03:00
94627baa5c
New rate limiter
2019-11-11 12:13:06 +00:00
1b58b5c8db
Bump fast_sanitize
...
Fixes build fails on freebsd
2019-11-08 22:22:54 +03:00
44f942e17d
Bump fast_sanitize to 0.1.2
...
Fixes build issues on macOS
2019-11-08 19:40:13 +03: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
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
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
9cde3321a3
Add fast_sanitize to dependencies
2019-10-29 01:21:00 +03: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
b057f2ae9e
mix.lock: Bump hackney to 1.15.2
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-25 23:17:11 +02:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07: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
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
6b0e8b73df
bump ex_doc version
2019-09-11 09:25:33 +03:00
68e45a327f
changelog
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
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
0afaf96640
update mix.lock
2019-07-23 19:49:36 +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
0384459ce5
Update mix.lock
2019-07-12 18:16:54 +03:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
663aebdd59
Update `gettext` dependency
2019-07-10 18:10:09 +07:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
bf22ed5fbd
Update `auto_linker` dependency
2019-06-12 15:53:33 +07:00
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
581d8d3035
Update `plug` dependency
2019-06-11 16:50:35 +07:00
7c063a898d
Update `ex_rated` dependency
2019-06-11 16:25:47 +07:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
f4cfcead88
Mix: Bring ecto-sql back to mainline.
2019-05-22 11:44:17 +02:00
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
5743124c77
Dependencies: Update tzdata.
...
This fixes the bug that tz data could not be loaded. Closes #910 .
2019-05-17 11:51:50 +02:00
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
718b59a263
Dependencies: Update ecto sql once more.
2019-05-17 11:19:30 +02:00
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
f831acf912
Excoveralls for code coverage
2019-05-15 15:19:20 +00:00
href