limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
12268 commits 27 branches 107 tags 315 MiB
Commit graph

291 commits

Author SHA1 Message Date
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction 2020-03-01 12:01:39 +03:00
rinpatch
c026128325 deps: update cachex to 3.2.0 2020-02-29 20:40:23 +03:00
Maksim Pechnikov
10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +03:00
Alexander Strizhakov
3849bbb60d
temp using tesla from fork 2020-02-21 12:30:37 +03:00
Mark Felder
cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Mark Felder
81cc9dd085 Merge branch 'develop' into chore/floki-update 2020-02-17 14:13:05 -06:00
lain
7df13e6f3a Update plug_crypto 2020-02-17 11:41:14 +01:00
Maksim Pechnikov
28701c08ad Merge branch 'develop' into issue/1276 2020-02-17 08:56:03 +03:00
rinpatch
472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Haelwenn (lanodan) Monnier
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
 2020-02-14 19:16:22 +01:00
Haelwenn (lanodan) Monnier
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm 2020-02-14 19:09:41 +01:00
Mark Felder
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)
 2020-02-14 10:16:12 -06:00
rinpatch
070069125f deps: update back fast sanitize 
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
 2020-02-13 19:48:22 +03:00
feld
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
rinpatch
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
 2020-02-11 16:17:03 +03:00
rinpatch
9172540f8d deps: update floki to 0.25.0 
needed to make it use fast_html
 2020-02-11 16:16:29 +03:00
Maksim Pechnikov
58574ef156 Merge branch 'develop' into issue/1276 2020-02-11 08:35:26 +03:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
Maksim Pechnikov
cd040691bd maked unread_count as virtual field 2020-02-10 09:01:45 +03:00
rinpatch
f57cea17bc deps: update plug to 1.9 
Includes functionality needed to fix upload limit not being changed at
runtime:
087cd64d86
 2020-02-07 18:38:36 +03:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
Maksim Pechnikov
02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Maksim Pechnikov
b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03:00
lain
6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop' 
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115
 2020-01-20 14:42:43 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
rinpatch
205e73058d mix.lock: update mock to 0.3.4 
This version adds Mock.passthrough/1 which I need to use in a test
 2020-01-19 13:42:52 +03:00
Maksim Pechnikov
b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
Egor Kislitsyn
520940d3e2
Update captcha dependency 2019-12-28 19:48:54 +07:00
Maksim Pechnikov
67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Egor Kislitsyn
e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
rinpatch
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.
 2019-12-11 20:44:45 +03:00
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
Maksim Pechnikov
469c0956cd update excoveralls 2019-12-04 09:43:01 +03:00
Maksim Pechnikov
29a98b86b7 Merge branch 'develop' into issue/1383 2019-12-04 09:34:44 +03:00
Egor Kislitsyn
cf52106e05
Update Floki dependency 2019-12-02 13:38:35 +07:00
Ivan Tashkinov
52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	mix.lock
 2019-11-29 10:17:59 +03:00
Maksim Pechnikov
b7c449118b Merge branch 'develop' into issue/1383 2019-11-28 21:27:01 +03:00
Maksim Pechnikov
d55859f5a4 remove quantum package 2019-11-27 16:35:12 +03:00
stwf
bd1984f054 update tests and Oban 2019-11-26 15:24:34 -05:00
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