Commit graph

251 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm 2020-02-14 19:09:41 +01:00
Mark Felder 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
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch 9172540f8d deps: update floki to 0.25.0
needed to make it use fast_html
2020-02-11 16:16:29 +03:00
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
rinpatch 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
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
Alexander Strizhakov 33bd8fbffe
filename and test fixes 2020-01-28 18:02:11 +03:00
Alexander Strizhakov 93b9f226e0
path fix 2020-01-28 16:32:33 +03:00
Alexander Strizhakov 251bbd794a Apply suggestion to mix.exs 2020-01-28 13:29:44 +00:00
Alexander Strizhakov aa3ba63513
like this 2020-01-28 15:41:45 +03:00
Alexander Strizhakov 91ea3ed82c
moving restarter application into pleroma repo 2020-01-28 15:19:05 +03:00
Maksim Pechnikov 02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application 2020-01-25 18:42:04 +03:00
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03:00
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
Egor Kislitsyn 520940d3e2
Update captcha dependency 2019-12-28 19:48:54 +07:00
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Egor Kislitsyn e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
Maksim Pechnikov 469c0956cd update excoveralls 2019-12-04 09:43:01 +03:00
Ivan Tashkinov 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
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383 2019-11-28 21:27:01 +03:00
Maksim Pechnikov d55859f5a4 remove quantum package 2019-11-27 16:35:12 +03:00
Maksim Pechnikov a4f834a687 moved DigestEmail to Oban Periodic jobs 2019-11-27 15:59:13 +03:00
stwf bd1984f054 update tests and Oban 2019-11-26 15:24:34 -05:00
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs 2019-11-25 14:32:20 +03:00
Ivan Tashkinov 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
Egor Kislitsyn 8ffd1c792c
Remove version mismatch warning 2019-11-21 18:22:18 +07:00
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
Steven Fuchs 94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
rinpatch 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
rinpatch 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
Ariadne Conill 203d9812f0 mix: update fast_sanitize dependency to 1af67547 2019-11-04 08:38:40 -06:00
Ariadne Conill f42f300870 update fast sanitize dependency 2019-11-03 15:41:30 -06:00
rinpatch 55ef88ef95 Bump fast_sanitize version 2019-11-01 20:58:24 +03:00
Mark Felder bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux 2019-10-30 17:57:08 -05:00
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
rinpatch 77cfb08b8c Remove commented-out code 2019-10-29 20:58:54 +03:00
rinpatch 61400d7eb7 Fix XSS emoji test 2019-10-29 20:49:32 +03:00
rinpatch 7358cf1f20 Bump fast_sanitize dependency 2019-10-29 17:00:03 +03:00
rinpatch 41c23251f1 Bump fast_sanitize version 2019-10-29 13:05:20 +03:00
rinpatch 9cde3321a3 Add fast_sanitize to dependencies 2019-10-29 01:21:00 +03:00
rinpatch 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
rinpatch 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
lain 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
rinpatch 2f0ed5f6c4 Fix hiding branch name logic 2019-10-14 22:15:16 +03:00
rinpatch 17b8896c40 Correct version parser branch name detection 2019-10-14 18:45:16 +03:00
rinpatch 0e9243e8a2 Preparations for renaming master to stable 2019-10-14 18:38:51 +03:00