d6e8906aa7
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-01-22 14:57:50 -06:00
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
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
a17a9dcc4d
mix.exs: Put template into one variable with ~s[]
2021-01-16 02:42:52 +01:00
99c2e8ed5c
mix.exs: GNU sed doesn't into proper getopt()
2021-01-16 02:42:52 +01:00
23c6cea889
Add a mix alias to bump copyright
2021-01-15 17:26:02 -06:00
41a637c3a6
Split out year
2021-01-15 17:25:43 -06:00
3607dfefca
Add mix alias to easily add copyright headers to files
2021-01-15 16:53:55 -06:00
d2382ab5f4
Update Oban to 2.3.4
2021-01-15 15:01:48 -06:00
ddb4d5131e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-01-15 01:25:06 -06:00
9106048c61
Password: Replace Pbkdf2 with Password.
2021-01-13 15:11:11 +01:00
e8b0f560b0
Merge remote-tracking branch 'upstream/develop' into neckbeard
2021-01-01 19:16:27 -06:00
a594404f79
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-29 22:09:01 -06:00
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
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
b45de09a26
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-24 21:25:53 -06:00
5b838accc0
Update Linkify to 0.4.1
...
Fixes false positive detection of IPv4 addresses
2020-12-23 09:07:01 -06:00
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
d667630a92
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-15 16:27:43 -06:00
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
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
3f21a16db7
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-12 14:13:25 -06:00
7d78c00049
Majic: specify commit so source users do not get surprise updates
2020-12-12 13:04:16 -06:00
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
68fc2080c2
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-12-02 20:15:58 -06:00
45949b5cd3
Update Linkify to 0.4.0
2020-12-01 17:26:25 -06:00
5032a5ea02
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-26 10:14:50 -06:00
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
2020-11-25 14:10:24 +03:00
345d5c582d
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-24 10:50:03 -06:00
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
770a29054f
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-19 21:00:39 -06:00
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
b1fc9fe951
mix.exs: bump development version to 2.2.50 after 2.2.0 release
2020-11-17 15:14:35 +03:00
3f69680ed9
mix.exs: Update tesla to 1.4.0
2020-11-17 13:09:56 +01:00
eea962fc10
Fix S3 uploads with Elixir 1.11
2020-11-16 19:51:44 +00:00
adcb076ddb
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-11-15 22:25:56 -06:00
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
14900164b8
[ #3059 ] Used forked prometheus-phx to remove log spam.
2020-10-22 17:58:25 +03:00
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
fbd71abc1a
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-10-16 00:14:53 -05:00
c4fae2611f
Switch Majic to a copy hosted in our GitLab
2020-10-12 12:25:45 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
f3bc076f09
Temporarily soft-fork prometheus_ex
2020-10-07 10:23:20 -05:00
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
2020-10-07 09:50:51 -05:00
f28a994b5d
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-10-05 14:32:56 -05:00
cee1883b35
Update Oban to 2.1.0
2020-09-30 07:53:19 -05:00
4c4b7e71c1
Merge remote-tracking branch 'upstream/develop' into neckbeard
2020-09-12 15:36:20 -05:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
0c1d243185
bump concurrent_limiter
...
Should fix gun deadlocks
2020-09-09 18:34:07 +03:00
Your New SJW Waifu
feld
Haelwenn (lanodan) Monnier
lain
Alexander Strizhakov
rinpatch
Mark Felder
Ivan Tashkinov