Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
stwf
bd1984f054
update tests and Oban
5 years ago
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
5 years ago
Egor Kislitsyn
8ffd1c792c
Remove version mismatch warning
5 years ago
Ivan Tashkinov
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
Steven Fuchs
94627baa5c
New rate limiter
5 years ago
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.
5 years ago
rinpatch
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
Ariadne Conill
203d9812f0
mix: update fast_sanitize dependency to 1af67547
5 years ago
Ariadne Conill
f42f300870
update fast sanitize dependency
5 years ago
rinpatch
55ef88ef95
Bump fast_sanitize version
5 years ago
Mark Felder
bd0f7f2e09
Bump fast_sanitize dependency so this builds on more than just Linux
5 years ago
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
rinpatch
77cfb08b8c
Remove commented-out code
5 years ago
rinpatch
61400d7eb7
Fix XSS emoji test
5 years ago
rinpatch
7358cf1f20
Bump fast_sanitize dependency
5 years ago
rinpatch
41c23251f1
Bump fast_sanitize version
5 years ago
rinpatch
9cde3321a3
Add fast_sanitize to dependencies
5 years ago
rinpatch
2453928b57
Ensure myhtmlex is started before swarm
...
Otherwise swarm is going to attempt resizing the cluster and timeout
5 years ago
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.
5 years ago
lain
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
rinpatch
2f0ed5f6c4
Fix hiding branch name logic
5 years ago
rinpatch
17b8896c40
Correct version parser branch name detection
5 years ago
rinpatch
0e9243e8a2
Preparations for renaming `master` to `stable`
5 years ago
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
kaniini
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
Egor Kislitsyn
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Alex S
1d285e6fad
moving to separate dir
5 years ago
Haelwenn
5c78131ee2
Merge branch 'bugfix/docs-formatting' into 'develop'
...
Improve generated docs formatting
See merge request pleroma/pleroma!1688
5 years ago
Haelwenn (lanodan) Monnier
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
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
feld
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
Maksim Pechnikov
d201eec45c
fixed ecto version
5 years ago
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.
5 years ago
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
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
kaniini
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
Maksim Pechnikov
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
Alex S
69faec031d
markdown generation to the new file
5 years ago
Alex S
6b0e8b73df
bump ex_doc version
5 years ago
Alex S
511d93fa54
mix docs generates config.md
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago