norm/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
15140 commits 32 branches 57 tags 277 MiB
Commit graph

509 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
7c5e007b9c
mix: Update pot to ~> 1.0 2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption 2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
166455c884
mix: Switch hackney & gun to releases 2021-06-03 19:10:47 +02:00
Alex Gleason
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash 2021-05-14 09:09:32 -05:00
Alex Gleason
543e9402d6
Support blurhash 2021-05-14 09:07:16 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark 2021-04-30 13:17:03 -05:00
Alex Gleason
004bcedb07
Upgrade Earmark 1.4.15 2021-04-30 12:23:11 -05:00
Alexander Strizhakov
681a42c359
release runtime provider fix for paths 2021-04-08 15:45:31 +03:00
Alexander Strizhakov
4d046afd27
tests for release config provider 2021-03-27 09:05:33 +03:00
Haelwenn
a2aa309496 Merge branch 'update_open_api_spex' into 'develop' 
Update OpenApiSpex dependency

See merge request pleroma/pleroma!3362
 2021-03-16 01:54:43 +00:00
Ivan Tashkinov
92526e0230 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-03-07 11:34:39 +03:00
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency 2021-03-05 15:51:29 +04:00
Ivan Tashkinov
5856f51717 [#3213] ActivityPub hashtags filtering refactoring. Test fix. 2021-03-03 23:09:30 +03:00
lain
c5352e90be Changelog, mix: merge in stable 2021-03-03 13:56:40 +01:00
lain
0a589c887b Mix: Update linkify. 2021-03-02 17:03:14 +01:00
lain
cd6aa9bcae Mix: Update version number 2021-03-01 21:13:43 +01:00
Mark Felder
9272cef500 Switch to a build of Majic that does not try to fix extensions by default 2021-01-28 14:03:29 -06:00
feld
b5899fda1a Merge branch 'copyright-fun' into 'develop' 
Mix aliases for handling copyright headers

See merge request pleroma/pleroma!3257
 2021-01-20 22:51:56 +00:00
Haelwenn (lanodan) Monnier
3e0d1588a4
mix.exs: Make copyright regexes more precise 
- Add copyright checks for Pleroma's not any copyright
- Copyright bump fixes the whole line instead of just the year
 2021-01-16 02:42:53 +01:00
Haelwenn (lanodan) Monnier
a17a9dcc4d
mix.exs: Put template into one variable with ~s[] 2021-01-16 02:42:52 +01:00
Haelwenn (lanodan) Monnier
99c2e8ed5c
mix.exs: GNU sed doesn't into proper getopt() 2021-01-16 02:42:52 +01:00
Mark Felder
23c6cea889 Add a mix alias to bump copyright 2021-01-15 17:26:02 -06:00
Mark Felder
41a637c3a6 Split out year 2021-01-15 17:25:43 -06:00
Mark Felder
3607dfefca Add mix alias to easily add copyright headers to files 2021-01-15 16:53:55 -06:00
Mark Felder
d2382ab5f4 Update Oban to 2.3.4 2021-01-15 15:01:48 -06:00
lain
9106048c61 Password: Replace Pbkdf2 with Password. 2021-01-13 15:11:11 +01:00
Mark Felder
a1a58f0a53 Switch to local fork of crypt until upstream fixes ability to build on aarch64 
https://github.com/msantos/crypt/pull/8
 2020-12-28 17:52:18 -06:00
lain
e4f1d8f48c Merge branch 'cachex-test' into 'develop' 
Test framework overhaul (speed, reliability)

See merge request pleroma/pleroma!3209
 2020-12-26 10:26:35 +00:00
Mark Felder
5b838accc0 Update Linkify to 0.4.1 
Fixes false positive detection of IPv4 addresses
 2020-12-23 09:07:01 -06:00
lain
713612c377 Cachex: Make caching provider switchable at runtime. 
Defaults to Cachex.
 2020-12-18 17:44:46 +01:00
Alexander Strizhakov
cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed 
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
 2020-12-14 11:02:32 -06:00
rinpatch
f687befb93 Merge branch 'fix/hackney-follow-redirects' into 'develop' 
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix

Closes #2342

See merge request pleroma/pleroma!3199
 2020-12-13 12:16:41 +00:00
Mark Felder
7d78c00049 Majic: specify commit so source users do not get surprise updates 2020-12-12 13:04:16 -06:00
Mark Felder
3299fea9e3 Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-12 13:01:30 -06:00
Mark Felder
6520599b7d Update Earmark to 1.4.13, use the new compact_output mode 2020-12-11 17:23:03 -06:00
Alex Gleason
e9e17e5df3 Upgrade Earmark to v1.4.10 2020-12-11 17:22:17 -06:00
Mark Felder
45949b5cd3 Update Linkify to 0.4.0 2020-12-01 17:26:25 -06:00
Alexander Strizhakov
5eef4988bf
fix for elixir 1.11 
load runtime configs in releases with config provider
 2020-11-25 14:10:24 +03:00
Mark Felder
60c8c5402c Update Linkify to 0.3.0 
Added

- Support returning result as iodata and as safe iodata

Fixed

- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
 2020-11-23 11:22:50 -06:00
rinpatch
83ec4aadd6 Merge branch 'chores/tesla_1.4.0' into 'develop' 
mix.exs: Update tesla to 1.4.0

See merge request pleroma/pleroma!3152
 2020-11-17 12:42:51 +00:00
rinpatch
b1fc9fe951 mix.exs: bump development version to 2.2.50 after 2.2.0 release 2020-11-17 15:14:35 +03:00
Haelwenn (lanodan) Monnier
3f69680ed9
mix.exs: Update tesla to 1.4.0 2020-11-17 13:09:56 +01:00
Mark Felder
eea962fc10 Fix S3 uploads with Elixir 1.11 2020-11-16 19:51:44 +00:00
Mark Felder
2f2281fdf1 Ensure URLs for git repos end in .git for older git clients like on CentOS 7 2020-11-02 17:09:56 -06:00
Ivan Tashkinov
14900164b8 [#3059] Used forked prometheus-phx to remove log spam. 2020-10-22 17:58:25 +03:00
Ivan Tashkinov
8a55de1d78 [#3059] Fixed Phoenix 1.5 telemetry processing. 2020-10-22 13:54:15 +03:00
Ivan Tashkinov
9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 2020-10-17 17:53:47 +03:00
Mark Felder
c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Mark Felder
f3bc076f09 Temporarily soft-fork prometheus_ex 2020-10-07 10:23:20 -05:00
Mark Felder
268f7f492a Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings 2020-10-07 09:50:51 -05:00
Mark Felder
cee1883b35 Update Oban to 2.1.0 2020-09-30 07:53:19 -05:00
Mark Felder
55562ca936 Merge branch 'develop' into feature/gen-magic 2020-09-10 16:05:22 -05:00
rinpatch
0c1d243185 bump concurrent_limiter 
Should fix gun deadlocks
 2020-09-09 18:34:07 +03:00
rinpatch
6c6de8e5df Merge branch 'temp-hackney-fix' into 'develop' 
temp hackney fix

See merge request pleroma/pleroma!2951
 2020-09-07 12:47:43 +00:00
rinpatch
8628e1b216 switch back to upstream tesla 
The patch we required got merged upstream: 9f7261ca49
 2020-09-07 15:21:20 +03:00
Alexander Strizhakov
de7e2ae0b5
use override flag for hackney dependency 2020-09-05 11:15:27 +03:00
rinpatch
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
Alexander Strizhakov
8bd2b6eb13
temp hackney fix 2020-09-04 14:24:15 +03:00
rinpatch
ce387ce730 mix.exs: bump development version after 2.1.0 release 2020-08-28 16:15:57 +03:00
lain
b141e35d64 Mix: Update version 2020-08-28 11:34:48 +02:00
lain
49a436ad3e Mix: Make rc version explicit. 2020-08-25 16:07:07 +02:00
lain
ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0 2020-08-25 15:38:12 +02:00
rinpatch
c662b09eee mix.exs: update fast_sanitize to 0.2.0 2020-08-07 16:45:33 +03:00
Roman Chvanikov
4672b61106 Merge branch 'develop' into command-available-check 2020-08-05 19:16:48 +03:00
Mark Felder
697e3db01c Add analyze mix alias to run the same credo checks we use in CI 2020-08-04 08:55:40 -05:00
rinpatch
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
Maksim Pechnikov
56171cbde6 set versions 2020-07-30 09:23:35 +03:00
Maksim Pechnikov
b261135683 updated cors_plug 2020-07-30 09:12:42 +03:00
Maksim Pechnikov
aac7e0314e set postgrex version 2020-07-30 09:08:50 +03:00
Maksim Pechnikov
4f10ef5e46 set web_push_encryption version 2020-07-30 09:08:03 +03:00
Maksim Pechnikov
df82839c30 updated calendar package 2020-07-30 08:58:19 +03:00
Maksim Pechnikov
cd2423d7f5 update mogrify package 2020-07-29 09:22:49 +03:00
Maksim Pechnikov
b4603a9c9c set http_signatures version 2020-07-29 07:23:06 +03:00
Maksim Pechnikov
d6e36aaf06 set jason version 2020-07-29 07:13:59 +03:00
Maksim Pechnikov
88f57418c8 updated pot package 2020-07-29 07:02:36 +03:00
Maksim Pechnikov
992a271196 updated the minor version packages 2020-07-29 07:00:27 +03:00
Maksim Pechnikov
ed881247b7 set swoosh version 2020-07-29 06:50:00 +03:00
Maksim Pechnikov
15b8446cdb updated dev & test packages 2020-07-29 06:47:56 +03:00
Maksim Pechnikov
3e5fb90eaa locked earmark version 2020-07-28 07:00:02 +03:00
lain
a81581472f Merge branch 'linkify' into 'develop' 
Fix Linkify

See merge request pleroma/pleroma!2792
 2020-07-23 10:28:52 +00:00
Haelwenn (lanodan) Monnier
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
lain
5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" 
This reverts merge request !2784
 2020-07-21 22:18:17 +00:00
lain
696c13ce54 Revert "Merge branch 'linkify' into 'develop'" 
This reverts merge request !2677
 2020-07-21 22:17:34 +00:00
Alex Gleason
5d263dfdb3
Update linkify to latest release 2020-07-20 09:29:03 -05:00
Alex Gleason
5701840d30
Use updated Linkify from git 2020-07-16 15:01:13 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify 2020-07-16 14:51:36 -05:00
href
ebfa591689 Go back to upstream Tesla 2020-07-15 15:26:35 +03:00
href
6b1f6a1cf7 Bump gun 2020-07-15 15:26:35 +03:00
rinpatch
4128e3a84a HTTP: Implement max request limits 2020-07-15 15:26:35 +03:00
rinpatch
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
Roman Chvanikov
05187d497d One can not simply call application modules from mix.exs 2020-07-11 16:09:46 +03:00
Roman Chvanikov
aedbbec88a Add Pleroma.Utils.command_available?/1 and use where appropriate 2020-07-11 15:48:45 +03:00
Mark Felder
3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
Mark Felder
d7a37fddd1 Switch to the official Oban 2.0.0 release 2020-07-10 11:33:08 -05:00
Alexander Strizhakov
b6688030fa
prometheus update for OTP 23 2020-07-10 10:35:59 +03:00
Mark Felder
4d3d867f10 Update Oban to 2.0-rc3 2020-07-03 10:37:07 -05:00
Mark Felder
4695bdd81b Merge branch 'develop' into issue/1790-updated-oban 2020-07-03 10:36:41 -05:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version 
https://git.pleroma.social/pleroma/elixir-libraries/linkify
 2020-06-30 16:39:15 -05:00
Maksim Pechnikov
dc60b1ee58 updated swoosh 2020-06-29 16:27:01 +03:00
Maksim Pechnikov
721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
Maksim Pechnikov
71e233268a oban 2.0-rc2 2020-06-23 21:47:01 +03:00
Maksim Pechnikov
a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
lain
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
href
f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME 2020-06-16 15:27:27 +02:00
Steven Fuchs
aca6a7543a Upgrade to Elixir 1.9 2020-06-16 13:18:29 +00:00
href
ec1452fd1c Pleroma.MIME: use gen_magic 2020-06-16 15:15:50 +02:00
rinpatch
9046f85ced mix.exs: bump to 2.0.7 2020-06-12 21:09:28 +03:00
rinpatch
fe8cf54829 mix.exs: bump version to 2.0.6 2020-06-08 01:33:07 +03:00
Roman Chvanikov
0186f56d93 Update crypt library 2020-06-08 00:58:31 +03:00
Roman Chvanikov
512261c97d Update crypt library 2020-05-19 14:46:06 +03:00
Alex Gleason
9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -05:00
lain
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
Alex Gleason
b46811a074
Upgrade Comeonin to v5 
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
 2020-05-12 17:14:59 -05:00
rinpatch
2906cbbd40 mix.exs: bump to 2.0.5 2020-05-13 00:33:38 +03:00
rinpatch
b5b675fa14 fix eldap being required for non-OTP releases 2020-05-12 23:05:31 +03:00
rinpatch
da2fe8920d fix eldap being required for non-OTP releases 2020-05-12 23:03:21 +03:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
rinpatch
9c23955879 mix.exs: bump version to 2.0.4 2020-05-10 18:03:33 +03:00
rinpatch
a74c31ff63 include eldap in OTP releases 
Closes #1313
 2020-05-10 01:09:20 +03:00
rinpatch
b6d1bcc55d include eldap in OTP releases 
Closes #1313
 2020-05-09 15:17:12 +03:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
rinpatch
04f23294d3 mix.exs: bump to 2.0.3 2020-05-02 19:16:27 +03:00
Haelwenn (lanodan) Monnier
0d74e38f5f mix.exs: Do not bail out when .git doesn’t exists 2020-05-01 00:55:37 +03:00
Haelwenn (lanodan) Monnier
053c461530
mix.exs: proper check on 0, remove else in git_pre_release 2020-04-24 00:45:12 +02:00
Haelwenn (lanodan) Monnier
c63d6ba0b2
mix.exs: branch_name fallbacks to "" 2020-04-23 23:44:30 +02:00
Haelwenn (lanodan) Monnier
b429a49504
mix.exs: Fix for MacOS 2020-04-23 23:44:03 +02:00
Egor Kislitsyn
736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
Haelwenn (lanodan) Monnier
c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists 2020-04-19 20:24:32 +02:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses 2020-04-13 18:17:07 +04:00
Maksim Pechnikov
648cc699e5 Merge branch 'develop' into support/update_oban 2020-04-10 07:09:28 +03:00
kPherox
c2aad36aa8 Rename function 2020-04-09 23:19:41 +00:00
kPherox
0e8f6d24b8
Create OTP_VERSION file by mix release 2020-04-10 00:22:50 +09:00
lain
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
Maksim Pechnikov
591f7015d9 update Oban package 2020-04-02 09:34:11 +03:00
Egor Kislitsyn
23219e6fb3
Add OpenAPI 2020-04-01 23:13:08 +04:00
rinpatch
a674094ec6 mix.exs bump version to 2.0.2 2020-03-31 14:02:51 +03:00
rinpatch
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
Alexander Strizhakov
1fcdcb12a7
updating gun with bug fix 
https://github.com/ninenines/gun/issues/222
 2020-03-30 12:47:12 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
Cevado
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
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier
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
rinpatch
e3f26920d0 mix.exs: bump version to 2.0.1 2020-03-15 16:54:27 +03:00
Haelwenn (lanodan) Monnier
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
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
rinpatch
86e7709a4d mix.exs: bump version to development one 2020-03-08 23:24:30 +03:00
rinpatch
3508ae7039 version bump changelog and mix version 2020-03-05 22:35:23 +03:00
Alexander Strizhakov
fe47bcde8c
updating tesla ref 2020-03-04 19:44:03 +03:00