ShariVegas/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
8295 commits 14 branches 60 tags 272 MiB
Commit graph

175 commits

Author SHA1 Message Date
rinpatch
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
feld
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
rinpatch
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
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
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
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
Maksim Pechnikov
02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Maksim Pechnikov
b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03:00
lain
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
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
rinpatch
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
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
rinpatch
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
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
469c0956cd update excoveralls 2019-12-04 09:43:01 +03:00
Maksim Pechnikov
29a98b86b7 Merge branch 'develop' into issue/1383 2019-12-04 09:34:44 +03:00
Egor Kislitsyn
cf52106e05
Update Floki dependency 2019-12-02 13:38:35 +07: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
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
3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-18 20:43:19 +03:00
Ivan Tashkinov
aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
rinpatch
fad296e432 Bump fast_sanitize 2019-11-16 19:19:25 +03:00
Steven Fuchs
94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
rinpatch
1b58b5c8db Bump fast_sanitize 
Fixes build fails on freebsd
 2019-11-08 22:22:54 +03:00
rinpatch
44f942e17d Bump fast_sanitize to 0.1.2 
Fixes build issues on macOS
 2019-11-08 19:40:13 +03: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
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
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
9cde3321a3 Add fast_sanitize to dependencies 2019-10-29 01:21:00 +03:00
minibikini
f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
kaniini
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
Haelwenn (lanodan) Monnier
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
Egor Kislitsyn
b5dfe83433 Replace Pleroma.FlakeId with flake_id hex package 2019-09-25 17:14:31 +07: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