053c461530
mix.exs: proper check on 0, remove else in git_pre_release
4 years ago
c63d6ba0b2
mix.exs: branch_name fallbacks to ""
4 years ago
b429a49504
mix.exs: Fix for MacOS
4 years ago
736fead494
Merge branch 'develop' into openapi/account
4 years ago
c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
4 years ago
22bde21c4f
remote_ip plug adds remote_ip_found flag
4 years ago
03124c96cc
Add spec for AccountController.statuses
5 years ago
648cc699e5
Merge branch 'develop' into support/update_oban
5 years ago
c2aad36aa8
Rename function
5 years ago
0e8f6d24b8
Create OTP_VERSION file by `mix release`
5 years ago
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
591f7015d9
update Oban package
5 years ago
23219e6fb3
Add OpenAPI
5 years ago
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
5 years ago
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
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.
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
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
5 years ago
d9f8941dac
Merge branch 'develop' into gun
5 years ago
86e7709a4d
mix.exs: bump version to development one
5 years ago
3508ae7039
version bump changelog and mix version
5 years ago
fe47bcde8c
updating tesla ref
5 years ago
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
5 years ago
85d571fc23
Move Tesla repo to our GitLab
5 years ago
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
c026128325
deps: update cachex to 3.2.0
5 years ago
3849bbb60d
temp using tesla from fork
5 years ago
cf94349287
Merge branch 'develop' into gun
5 years ago
514c899275
adding gun adapter
5 years ago
472132215e
Use floki's new APIs for parsing fragments
5 years ago
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm
5 years ago
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)
5 years ago
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
33bd8fbffe
filename and test fixes
5 years ago
93b9f226e0
path fix
5 years ago
251bbd794a
Apply suggestion to mix.exs
5 years ago
aa3ba63513
like this
5 years ago
91ea3ed82c
moving restarter application into pleroma repo
5 years ago
02c3dd2e3d
update ecto
5 years ago
e93cc561cd
restarting pleroma from outside application
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
520940d3e2
Update `captcha` dependency
5 years ago
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
e536796984
Add native captcha and enable it by default.
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
469c0956cd
update excoveralls
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
d55859f5a4
remove `quantum` package
5 years ago
a4f834a687
moved DigestEmail to Oban Periodic jobs
5 years ago
bd1984f054
update tests and Oban
5 years ago
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
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
5 years ago
8ffd1c792c
Remove version mismatch warning
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
94627baa5c
New rate limiter
5 years ago
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.
5 years ago
9d3b12a658
Bump HtmlEntities to 0.5
...
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
5 years ago
203d9812f0
mix: update fast_sanitize dependency to 1af67547
5 years ago
f42f300870
update fast sanitize dependency
5 years ago
55ef88ef95
Bump fast_sanitize version
5 years ago
bd0f7f2e09
Bump fast_sanitize dependency so this builds on more than just Linux
5 years ago
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
77cfb08b8c
Remove commented-out code
5 years ago
61400d7eb7
Fix XSS emoji test
5 years ago
7358cf1f20
Bump fast_sanitize dependency
5 years ago
41c23251f1
Bump fast_sanitize version
5 years ago
9cde3321a3
Add fast_sanitize to dependencies
5 years ago
2453928b57
Ensure myhtmlex is started before swarm
...
Otherwise swarm is going to attempt resizing the cluster and timeout
5 years ago
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.
5 years ago
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
2f0ed5f6c4
Fix hiding branch name logic
5 years ago
17b8896c40
Correct version parser branch name detection
5 years ago
0e9243e8a2
Preparations for renaming `master` to `stable`
5 years ago
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
f9380289eb
Add `remote_ip` plug
5 years ago
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
1d285e6fad
moving to separate dir
5 years ago
5c78131ee2
Merge branch 'bugfix/docs-formatting' into 'develop'
...
Improve generated docs formatting
See merge request pleroma/pleroma!1688
5 years ago
4785596a2c
markdown.ex: end suggestions list with a newline
...
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
5 years ago
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
d201eec45c
fixed ecto version
5 years ago
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.
5 years ago
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
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
5 years ago
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
Haelwenn (lanodan) Monnier