Commit Graph

399 Commits

Author SHA1 Message Date
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs 2019-11-25 14:32:20 +03:00
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-18 20:43:19 +03:00
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
rinpatch fad296e432 Bump fast_sanitize 2019-11-16 19:19:25 +03:00
Steven Fuchs 94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
rinpatch 1b58b5c8db Bump fast_sanitize
Fixes build fails on freebsd
2019-11-08 22:22:54 +03:00
rinpatch 44f942e17d Bump fast_sanitize to 0.1.2
Fixes build issues on macOS
2019-11-08 19:40:13 +03:00
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.
2019-11-08 00:51:04 +03:00
rinpatch 9d3b12a658 Bump HtmlEntities to 0.5
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
2019-11-05 12:37:25 +03:00
Ariadne Conill 203d9812f0 mix: update fast_sanitize dependency to 1af67547 2019-11-04 08:38:40 -06:00
rinpatch 55ef88ef95 Bump fast_sanitize version 2019-11-01 20:58:24 +03:00
Mark Felder bd0f7f2e09 Bump fast_sanitize dependency so this builds on more than just Linux 2019-10-30 17:57:08 -05:00
rinpatch 61400d7eb7 Fix XSS emoji test 2019-10-29 20:49:32 +03:00
rinpatch 7358cf1f20 Bump fast_sanitize dependency 2019-10-29 17:00:03 +03:00
rinpatch 9cde3321a3 Add fast_sanitize to dependencies 2019-10-29 01:21:00 +03:00
minibikini f9380289eb Add `remote_ip` plug 2019-09-27 21:59:23 +00:00
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
Haelwenn (lanodan) Monnier b057f2ae9e
mix.lock: Bump hackney to 1.15.2
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-25 23:17:11 +02:00
Egor Kislitsyn b5dfe83433 Replace `Pleroma.FlakeId` with `flake_id` hex package 2019-09-25 17:14:31 +07:00
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.
2019-09-17 21:51:50 +03:00
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
2019-09-17 13:04:43 +03:00
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser

See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser 2019-09-15 14:53:58 +03:00
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	docs/config.md
#	mix.lock
2019-09-14 16:11:44 +03:00
Alex S 6b0e8b73df bump ex_doc version 2019-09-11 09:25:33 +03:00
Alex S 68e45a327f changelog 2019-09-11 09:25:33 +03:00
Ivan Tashkinov 581123f8bb [#1149] Introduced `quantum` job scheduler. Documentation & config changes. 2019-08-23 18:28:23 +03:00
Ivan Tashkinov c29686309e [#1149] Upgraded `oban` from 0.6.0 to 0.7.1. 2019-08-23 09:23:10 +03:00
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
rinpatch 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.
2019-08-14 17:05:21 +03:00
Maksim bb9c539580 Uploader.S3 added support stream uploads 2019-08-10 11:27:59 +00:00
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
Ariadne Conill 9d78b3b281 mix: add ex_const dependency 2019-07-29 02:12:35 +00:00
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
Ariadne Conill 0afaf96640 update mix.lock 2019-07-23 19:49:36 +00:00
Roman Chvanikov afc7708dbe Fix pleroma_job_queue version 2019-07-21 00:01:58 +03:00
Roman Chvanikov 36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
Ariadne Conill cdf0038d0f mix: update http signatures dependency 2019-07-18 15:53:01 +00:00
Ariadne Conill 1e3aff6ef1 mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989 2019-07-17 19:00:26 +00:00
Roman Chvanikov e7c175c943 Use PleromaJobQueue for scheduling 2019-07-16 16:49:50 +03:00
Roman Chvanikov 9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
lain d302fcaa61 Dependencies: Update tzdata and related packages. 2019-07-15 16:47:39 +09:00
Roman Chvanikov 0384459ce5 Update mix.lock 2019-07-12 18:16:54 +03:00
Roman Chvanikov eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Egor Kislitsyn 663aebdd59 Update `gettext` dependency 2019-07-10 18:10:09 +07:00
Maksim 12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Maksim bb8065a1fd tests MRF filters 2019-07-10 05:12:21 +00:00
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
Alexander Strizhakov 4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
William Pitcock 481932309f mix: update bbcode dependency to v0.1.1 2019-06-21 23:42:50 +00:00
rinpatch f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00
Mark Felder 2ad5a8511d Update Phoenix to 1.4.8 2019-06-15 07:03:26 -05:00
Egor Kislitsyn bf22ed5fbd Update `auto_linker` dependency 2019-06-12 15:53:33 +07:00
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn 581d8d3035 Update `plug` dependency 2019-06-11 16:50:35 +07:00
Egor Kislitsyn 7c063a898d Update `ex_rated` dependency 2019-06-11 16:25:47 +07:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
lain f4cfcead88 Mix: Bring ecto-sql back to mainline. 2019-05-22 11:44:17 +02:00
lambda e5b34f5e05 Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.

See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
lain 5743124c77 Dependencies: Update tzdata.
This fixes the bug that tz data could not be loaded. Closes #910.
2019-05-17 11:51:50 +02:00
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update 2019-05-17 11:33:04 +02:00
lain 718b59a263 Dependencies: Update ecto sql once more. 2019-05-17 11:19:30 +02:00
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library

See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
feld f831acf912 Excoveralls for code coverage 2019-05-15 15:19:20 +00:00
lain 88cc423fa3 Dependencies: Update Ecto SQL. 2019-05-15 16:45:26 +02:00
William Pitcock 071f78733a switch to pleroma/http_signatures library 2019-05-14 20:03:13 +00:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
Roman Chvanikov f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
feld 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.
2019-05-11 01:34:17 +00:00
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
Conversations once more.

See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
lain 0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain 81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
Egor Kislitsyn 04fd7cf817 Update `auto_linker` 2019-05-01 15:18:12 +07:00
Roman Chvanikov 0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
William Pitcock 2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00:00
Roman Chvanikov 64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Roman Chvanikov 2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
rinpatch 37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Egor f9af90c5aa Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
Mark Felder b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld 3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
href b655a8ea83 Add recon 2019-04-04 11:22:30 -05:00
Egor Kislitsyn d313a0c49c Update `auto_linker` dependency 2019-04-03 19:41:15 +07:00
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
lain 17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02:00
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue` 2019-03-29 12:46:05 +00:00
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
Ivan Tashkinov 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +03:00
Ivan Tashkinov af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch 9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
Ivan Tashkinov 63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
William Pitcock e10ca35b3d mix: update dependencies for cowboy 2.0 2019-02-28 15:44:07 +00:00
Egor c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
Mark Felder bf562a6ecc Upate meck to fix tests on MacOS 2019-02-22 17:26:47 +00:00
William Pitcock 1c87102d01 mix: add timex dependency 2019-02-21 00:19:49 +00:00
Ivan Tashkinov 063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages. 2019-02-14 00:29:29 +03:00
Haelwenn (lanodan) Monnier 5bcea0deca
Install ex_syslogger 2019-01-06 01:11:52 +01:00
Maxim Filippov 2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
lain 91afbbe4ea Update Tesla and Hackney. 2019-01-01 13:49:48 +01:00
href ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged. 2018-12-17 17:28:03 +01:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
href f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
Maksim Pechnikov baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
Ivan Tashkinov 10c156d98f [#114] SMTP deps and config. 2018-12-12 17:01:34 +03:00
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn 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
2018-12-06 19:55:58 +07:00
Egor Kislitsyn 04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
Maksim Pechnikov 3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
kaniini 4a019827b2 Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
This reverts merge request !480
2018-11-27 23:19:30 +00:00
Maxim Filippov 0314f04c2a Add ex_doc & makeup_elixir to mix.lock 2018-11-28 01:12:11 +03:00
Haelwenn (lanodan) Monnier 8221c56c48
Add ex_doc 2018-11-10 13:09:37 +01:00
lain e954cfcc2c Add CORSPlug to make web-based OAuth easier. 2018-11-03 13:38:01 +01:00
William Pitcock b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
2018-10-05 20:49:34 +00:00
lain c0e067c74e Update Mix.lock 2018-09-05 22:00:41 +02:00
lambda 58539e1357 Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
2018-08-31 09:51:20 +00:00
William Pitcock 6aa65b68b8 common api: add support for formatting messages outside of twitter-style plain text 2018-08-31 03:13:59 +00:00
William Pitcock 4e4b1016ab mix: add ex_aws and ex_aws_s3 dependencies 2018-08-27 23:24:35 +00:00
William Pitcock 0835cf9faa update mix.lock 2018-08-16 23:27:09 +00:00
Tristan Mahé 2df0fd1462 mogrify mix.lock 2018-06-26 14:16:28 -07:00
Thog e55c6f311b
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
Mark Felder 366138fa72 Update httpoison to get the latest hackney.
Works on my computer ^TM
2018-04-11 13:55:54 +00:00
lain 4e4a3e5e13 Add mock. 2018-04-02 13:12:47 +02:00
lain fbc187ac15 Switch to Jason for json handling.
It's twice as fast and will be the standard in the coming ecto.
2018-03-27 16:09:08 +02:00
lain 20982ab4d0 Update dependencies. 2018-03-27 15:22:09 +02:00
Roger Braun 4e785df984 Update Phoenix, add Phoenix.HTML. 2017-09-06 19:05:35 +02:00
Roger Braun 6ee0ca21e2 Some salmon debug fixes.
Plus httpoison update.
2017-06-23 16:22:19 +02:00
Roger Braun 36ec998dd7 Update html_sanitize_ex. 2017-05-18 17:18:33 +02:00
dtluna 6cf7c13228 Refactor code to comply with credo suggestions 2017-04-27 16:18:50 +03:00
Roger Braun 424e0e7779 Add Websub verification. 2017-04-21 03:59:11 +02:00
Roger Braun 6bfd521974 Switch cache implementation for size limiting. 2017-04-17 11:36:17 +02:00
Roger Braun 03ddaead7e Add basic user caching.
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
Roger Braun 4cac385411 Add factories for testing. 2017-04-13 15:49:24 +02:00
Roger Braun d2bf099ae6 Fix twitter api date. 2017-04-12 19:34:58 +02:00
Roger Braun 2e88cc4cbd Add HTML sanitization library. 2017-04-03 18:28:00 +02:00
Roger Braun e4de0ddc77 Add single status fetching to TwAPI. 2017-03-24 01:16:28 +01:00
Roger Braun e32dbfc9a5 Add basic auth. 2017-03-20 17:56:45 +01:00
Roger Braun a93f3421a7 Phoenix skeleton 2017-03-17 17:09:58 +01:00