Commit graph

139 commits

Author SHA1 Message Date
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