e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
4 years ago
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
4 years ago
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
4 years ago
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
4 years ago
3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
9c3c142c32
Restore mix.lock after 2FA merge
...
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
4 years ago
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
4b00eb93fe
fix for syslog compile with updated rebar3
4 years ago
736fead494
Merge branch 'develop' into openapi/account
4 years ago
22bde21c4f
remote_ip plug adds remote_ip_found flag
4 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
4 years ago
247e6fcb90
Merge branch 'develop' into openapi/account
4 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
4 years ago
03124c96cc
Add spec for AccountController.statuses
5 years ago
648cc699e5
Merge branch 'develop' into support/update_oban
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
dbcfac11b4
Merge branch 'develop' into issue/1276
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
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
acb016397e
mix.lock: [minor] last hash appended
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
edb659dc57
Merge branch 'develop' into issue/1276
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
509c81e4b1
Merge branch 'develop' into gun
5 years ago
85d571fc23
Move Tesla repo to our GitLab
5 years ago
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
c026128325
deps: update cachex to 3.2.0
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
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
81cc9dd085
Merge branch 'develop' into chore/floki-update
5 years ago
7df13e6f3a
Update plug_crypto
5 years ago
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
472132215e
Use floki's new APIs for parsing fragments
5 years ago
a4a90ae422
Update all dependencies
...
Upgraded:
db_connection 2.2.0 => 2.2.1
earmark 1.4.2 => 1.4.3
ecto 3.3.1 => 3.3.3
ecto_sql 3.3.2 => 3.3.4
esshd 0.1.0 => 0.1.1
ex_doc 0.21.2 => 0.21.3
excoveralls 0.12.1 => 0.12.2
gettext 0.17.1 => 0.17.4
html_entities 0.5.0 => 0.5.1
httpoison 1.6.1 => 1.6.2
joken 2.1.0 => 2.2.0
jose 1.9.0 => 1.10.1
nimble_parsec 0.5.1 => 0.5.3
phoenix 1.4.10 => 1.4.13
phoenix_ecto 4.0.0 => 4.1.0
phoenix_html 2.13.3 => 2.14.0
plug_cowboy 2.1.0 => 2.1.2
plug_crypto 1.1.0 => 1.1.1
prometheus 4.4.1 => 4.5.0
tesla 1.3.0 => 1.3.2
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
070069125f
deps: update back fast sanitize
...
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
5 years ago
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
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
5 years ago
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
5 years ago
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
cd040691bd
maked `unread_count` as virtual field
5 years ago
f57cea17bc
deps: update plug to 1.9
...
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
02c3dd2e3d
update ecto
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
205e73058d
mix.lock: update mock to 0.3.4
...
This version adds Mock.passthrough/1 which I need to use in a test
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
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.
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
469c0956cd
update excoveralls
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
cf52106e05
Update Floki dependency
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
bd1984f054
update tests and Oban
5 years ago
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
fad296e432
Bump fast_sanitize
5 years ago
94627baa5c
New rate limiter
5 years ago
1b58b5c8db
Bump fast_sanitize
...
Fixes build fails on freebsd
5 years ago
44f942e17d
Bump fast_sanitize to 0.1.2
...
Fixes build issues on macOS
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
55ef88ef95
Bump fast_sanitize version
5 years ago
bd0f7f2e09
Bump fast_sanitize dependency so this builds on more than just Linux
5 years ago
61400d7eb7
Fix XSS emoji test
5 years ago
7358cf1f20
Bump fast_sanitize dependency
5 years ago
9cde3321a3
Add fast_sanitize to dependencies
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
b057f2ae9e
mix.lock: Bump hackney to 1.15.2
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
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
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
6b0e8b73df
bump ex_doc version
5 years ago
68e45a327f
changelog
5 years ago
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
6a101f0361
Switch to pre-1.8 version of tzdata.
...
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
5 years ago
bb9c539580
Uploader.S3 added support stream uploads
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
9d78b3b281
mix: add ex_const dependency
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
0afaf96640
update mix.lock
5 years ago
afc7708dbe
Fix pleroma_job_queue version
5 years ago
36049f08ef
Merge develop
5 years ago
cdf0038d0f
mix: update http signatures dependency
5 years ago
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
5 years ago
e7c175c943
Use PleromaJobQueue for scheduling
5 years ago
9bca70b10a
Merge develop
5 years ago
d302fcaa61
Dependencies: Update tzdata and related packages.
5 years ago
0384459ce5
Update mix.lock
5 years ago
eae991b06a
merge develop
5 years ago
663aebdd59
Update `gettext` dependency
5 years ago
12b1454245
[ #1062 ] added option to disable send email
5 years ago
bb8065a1fd
tests MRF filters
5 years ago
371d39e160
Merge develop
5 years ago
4e6e5d8042
reverse proxy tests
5 years ago
657277ffc0
Resolve conflicts
5 years ago
481932309f
mix: update bbcode dependency to v0.1.1
5 years ago
f30a3241d2
Deps: Update auto_linker
5 years ago
2ad5a8511d
Update Phoenix to 1.4.8
5 years ago
bf22ed5fbd
Update `auto_linker` dependency
5 years ago
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
581d8d3035
Update `plug` dependency
5 years ago
7c063a898d
Update `ex_rated` dependency
5 years ago
ce47017c89
Merge develop
5 years ago
f4cfcead88
Mix: Bring ecto-sql back to mainline.
5 years ago
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
5 years ago
5743124c77
Dependencies: Update tzdata.
...
This fixes the bug that tz data could not be loaded. Closes #910 .
5 years ago
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
718b59a263
Dependencies: Update ecto sql once more.
5 years ago
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
f831acf912
Excoveralls for code coverage
5 years ago
88cc423fa3
Dependencies: Update Ecto SQL.
5 years ago
071f78733a
switch to pleroma/http_signatures library
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f1f7a11222
Merge develop
5 years ago
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
5 years ago
b6b5b16ba4
Merge develop
5 years ago
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
04fd7cf817
Update `auto_linker`
5 years ago
0f0cc2703b
Merge develop
5 years ago
2bd880be88
mix: add bbcode dependency
5 years ago
64a2c6a041
Digest emails
5 years ago
2f0203a4a1
Resolve conflicts
6 years ago
37da03499e
Bump ex_doc
6 years ago
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b395aebf24
Pin recon dependency to 2.4.0
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
b655a8ea83
Add recon
6 years ago
d313a0c49c
Update `auto_linker` dependency
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
17ab9fa45b
BBS: Some more functionality.
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
e10ca35b3d
mix: update dependencies for cowboy 2.0
6 years ago
c3ac9424d2
AutoLinker
6 years ago
bf562a6ecc
Upate meck to fix tests on MacOS
6 years ago
1c87102d01
mix: add timex dependency
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
5bcea0deca
Install ex_syslogger
6 years ago
2aab4e03c3
Add OGP parser
6 years ago
91afbbe4ea
Update Tesla and Hackney.
6 years ago
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
04a48286e6
Add web push support
6 years ago
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
4a019827b2
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
...
This reverts merge request !480
6 years ago
0314f04c2a
Add ex_doc & makeup_elixir to mix.lock
6 years ago
8221c56c48
Add ex_doc
6 years ago
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
6 years ago
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
6 years ago
c0e067c74e
Update Mix.lock
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
Ivan Tashkinov