akkoma
4 years agosame copyright date format
Alexander Strizhakov [Wed, 4 Mar 2020 06:41:23 +0000 (09:41 +0300)]
same copyright date format

4 years agootp version
Alexander Strizhakov [Wed, 4 Mar 2020 06:23:42 +0000 (09:23 +0300)]
otp version

4 years agoretry_timeout description change
Alexander Strizhakov [Wed, 4 Mar 2020 05:56:36 +0000 (08:56 +0300)]
retry_timeout description change

4 years agoUpdate Copyrights for gun related files
Mark Felder [Tue, 3 Mar 2020 23:16:24 +0000 (17:16 -0600)]
Update Copyrights for gun related files

4 years agoMerge branch 'develop' into gun
Mark Felder [Tue, 3 Mar 2020 23:15:49 +0000 (17:15 -0600)]
Merge branch 'develop' into gun

4 years agoMerge branch 'chore/update-copyrights' into 'develop'
Haelwenn [Tue, 3 Mar 2020 23:15:12 +0000 (23:15 +0000)]
Merge branch 'chore/update-copyrights' into 'develop'

Update Copyrights

See merge request pleroma/pleroma!2269

4 years agoOlder copyright updates
Mark Felder [Tue, 3 Mar 2020 22:46:45 +0000 (16:46 -0600)]
Older copyright updates

4 years agoUpdate Copyrights
Mark Felder [Tue, 3 Mar 2020 22:44:49 +0000 (16:44 -0600)]
Update Copyrights

4 years agorefactoring for gun api modules
Alexander Strizhakov [Tue, 3 Mar 2020 16:24:14 +0000 (19:24 +0300)]
refactoring for gun api modules

4 years agodon't test gun itself
Alexander Strizhakov [Tue, 3 Mar 2020 15:57:16 +0000 (18:57 +0300)]
don't test gun itself

4 years agoadapter renaming to adapter_helper
Alexander Strizhakov [Tue, 3 Mar 2020 15:53:44 +0000 (18:53 +0300)]
adapter renaming to adapter_helper

4 years agoretry and retry_timeout settings default change
Alexander Strizhakov [Tue, 3 Mar 2020 15:01:35 +0000 (18:01 +0300)]
retry and retry_timeout settings default change

4 years agono try block in checkout connection
Alexander Strizhakov [Tue, 3 Mar 2020 14:44:04 +0000 (17:44 +0300)]
no try block in checkout connection

4 years agoproxy parse tests fix
Alexander Strizhakov [Tue, 3 Mar 2020 14:32:59 +0000 (17:32 +0300)]
proxy parse tests fix

4 years agoremove try block from pool request
Alexander Strizhakov [Tue, 3 Mar 2020 14:27:56 +0000 (17:27 +0300)]
remove try block from pool request

4 years agoproxy parsing errors
Alexander Strizhakov [Tue, 3 Mar 2020 14:27:22 +0000 (17:27 +0300)]
proxy parsing errors

4 years agopoolboy timeout fix
Alexander Strizhakov [Tue, 3 Mar 2020 13:51:49 +0000 (16:51 +0300)]
poolboy timeout fix

4 years agounnecessary mock
Alexander Strizhakov [Tue, 3 Mar 2020 13:46:20 +0000 (16:46 +0300)]
unnecessary mock

4 years agoreturn error if connection failed to open
Alexander Strizhakov [Tue, 3 Mar 2020 13:27:46 +0000 (16:27 +0300)]
return error if connection failed to open

4 years agonaming
Alexander Strizhakov [Tue, 3 Mar 2020 13:08:21 +0000 (16:08 +0300)]
naming

4 years agosimplification of formatting host method
Alexander Strizhakov [Tue, 3 Mar 2020 12:44:13 +0000 (15:44 +0300)]
simplification of formatting host method

case for format_proxy method

4 years agoremoving unused method
Alexander Strizhakov [Tue, 3 Mar 2020 12:12:09 +0000 (15:12 +0300)]
removing unused method

4 years agounnecessary with
Alexander Strizhakov [Tue, 3 Mar 2020 12:11:48 +0000 (15:11 +0300)]
unnecessary with

4 years agoremoving unnecessary with
Alexander Strizhakov [Tue, 3 Mar 2020 11:56:49 +0000 (14:56 +0300)]
removing unnecessary with

comment in tesla client impovement

4 years agohiding raise error logic to otp_version module
Alexander Strizhakov [Tue, 3 Mar 2020 10:24:19 +0000 (13:24 +0300)]
hiding raise error logic to otp_version module

4 years agonaming for checkin from pool timeout
Alexander Strizhakov [Tue, 3 Mar 2020 10:05:28 +0000 (13:05 +0300)]
naming for checkin from pool timeout

4 years agoApply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:53:37 +0000 (09:53 +0000)]
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex

4 years agoApply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:53:31 +0000 (09:53 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex

4 years agoApply suggestion to lib/pleroma/http/http.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:52:01 +0000 (09:52 +0000)]
Apply suggestion to lib/pleroma/http/http.ex

4 years agoApply suggestion to lib/pleroma/http/http.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:50:42 +0000 (09:50 +0000)]
Apply suggestion to lib/pleroma/http/http.ex

4 years agoApply suggestion to lib/pleroma/http/request_builder.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:46:53 +0000 (09:46 +0000)]
Apply suggestion to lib/pleroma/http/request_builder.ex

4 years agoApply suggestion to docs/configuration/cheatsheet.md
Alexander Strizhakov [Tue, 3 Mar 2020 09:45:18 +0000 (09:45 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md

4 years agoApply suggestion to lib/pleroma/http/adapter.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:34:36 +0000 (09:34 +0000)]
Apply suggestion to lib/pleroma/http/adapter.ex

4 years agoApply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:29:57 +0000 (09:29 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex

4 years agoApply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:29:51 +0000 (09:29 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex

4 years agootp_version refactor
Alexander Strizhakov [Tue, 3 Mar 2020 09:19:29 +0000 (12:19 +0300)]
otp_version refactor

4 years agodebug logs on pleroma restart
Alexander Strizhakov [Tue, 3 Mar 2020 07:33:40 +0000 (10:33 +0300)]
debug logs on pleroma restart

4 years agoMerge branch 'develop' into gun
Alexander Strizhakov [Tue, 3 Mar 2020 07:08:07 +0000 (10:08 +0300)]
Merge branch 'develop' into gun

4 years agoClarify in docs how to control connections_pool for Gun.
Mark Felder [Mon, 2 Mar 2020 19:00:05 +0000 (13:00 -0600)]
Clarify in docs how to control connections_pool for Gun.

It could easily be confused with the Hackney settings.

4 years agoMove Tesla repo to our GitLab
Mark Felder [Mon, 2 Mar 2020 18:52:41 +0000 (12:52 -0600)]
Move Tesla repo to our GitLab

4 years agoMerge branch 'prepared-statements-settings' into 'develop'
lain [Mon, 2 Mar 2020 17:00:04 +0000 (17:00 +0000)]
Merge branch 'prepared-statements-settings' into 'develop'

Prepared statements settings

See merge request pleroma/pleroma!2238

4 years agoMerge branch 'docs_cheatsheet_fix' into 'develop'
rinpatch [Mon, 2 Mar 2020 10:05:03 +0000 (10:05 +0000)]
Merge branch 'docs_cheatsheet_fix' into 'develop'

fix for :fetch_initial_posts

See merge request pleroma/pleroma!2266

4 years agofix for :fetch_initial_posts
ilja [Mon, 2 Mar 2020 09:29:24 +0000 (10:29 +0100)]
fix for :fetch_initial_posts

A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now

4 years agoMerge branch 'feature/1482-activity_pub_transactions' into 'develop'
Haelwenn [Mon, 2 Mar 2020 07:58:01 +0000 (07:58 +0000)]
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'

ActivityPub actions & side-effects in transaction

Closes #1482

See merge request pleroma/pleroma!2089

4 years agostop connections manually
Alexander Strizhakov [Mon, 2 Mar 2020 07:01:07 +0000 (10:01 +0300)]
stop connections manually

4 years agoreturning repo parameters
Alexander Strizhakov [Mon, 2 Mar 2020 06:22:34 +0000 (09:22 +0300)]
returning repo parameters

4 years agoMerge branch 'chores/bump-copyright' into 'develop'
Haelwenn [Mon, 2 Mar 2020 05:15:13 +0000 (05:15 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'

Bump copyright

See merge request pleroma/pleroma!2265

4 years agoBump copyright years of files changed after 2020-01-07
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 05:08:45 +0000 (06:08 +0100)]
Bump copyright years of files changed after 2020-01-07

Done via the following command:
git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'

4 years agoBump copyright years of files changed after 2019-01-01
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 04:54:39 +0000 (05:54 +0100)]
Bump copyright years of files changed after 2019-01-01

Done via the following command:
git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'

4 years agoMerge branch 'docs_cheatsheet' into 'develop'
rinpatch [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Merge branch 'docs_cheatsheet' into 'develop'

DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source

See merge request pleroma/pleroma!2262

4 years agoAdd warning to the fetch_initial_posts setting. Now we sometimes have people who...
Ilja [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
I also made a more explicit distinction between OTP and from source installs in the general explanation

4 years agoMerge branch 'develop' into gun
Alexander Strizhakov [Sun, 1 Mar 2020 09:48:49 +0000 (12:48 +0300)]
Merge branch 'develop' into gun

4 years agospec fix
Alexander Strizhakov [Fri, 17 Jan 2020 08:51:08 +0000 (11:51 +0300)]
spec fix

4 years agofix for compiling
Alexander Strizhakov [Mon, 30 Dec 2019 09:35:41 +0000 (12:35 +0300)]
fix for compiling

4 years agoActivityPub actions & side-effects in transaction
Alexander Strizhakov [Mon, 30 Dec 2019 08:30:20 +0000 (11:30 +0300)]
ActivityPub actions & side-effects in transaction

4 years agoMerge branch 'fix/easy-timeline-dos' into 'develop'
rinpatch [Sat, 29 Feb 2020 23:08:14 +0000 (23:08 +0000)]
Merge branch 'fix/easy-timeline-dos' into 'develop'

Cap the number of requested statuses in timelines to 40 and rate limit them

See merge request pleroma/pleroma!2253

4 years agotimeline controller: add a TODO for replacing copypaste with a macro
rinpatch [Sat, 29 Feb 2020 23:03:46 +0000 (02:03 +0300)]
timeline controller: add a TODO for replacing copypaste with a macro

4 years agochangelog: entries for timeline DoS fixes
rinpatch [Fri, 28 Feb 2020 14:59:16 +0000 (17:59 +0300)]
changelog: entries for timeline DoS fixes

4 years agotimeline controller: rate limit timelines to 3 requests per 500ms per timeline per...
rinpatch [Fri, 28 Feb 2020 14:44:59 +0000 (17:44 +0300)]
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user

4 years agorate limiter: Fix a race condition
rinpatch [Fri, 28 Feb 2020 14:35:01 +0000 (17:35 +0300)]
rate limiter: Fix a race condition

When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.

4 years agopagination: limit the number of elements returned at one time to 40
rinpatch [Fri, 28 Feb 2020 14:29:53 +0000 (17:29 +0300)]
pagination: limit the number of elements returned at one time to 40

4 years agoMerge branch 'rate-limiter-runtime-settings' into 'develop'
rinpatch [Sat, 29 Feb 2020 21:52:33 +0000 (21:52 +0000)]
Merge branch 'rate-limiter-runtime-settings' into 'develop'

RateLimiter improvements: runtime configurability, no default limits in tests

See merge request pleroma/pleroma!2250

4 years ago[#2250] Tiny refactoring per merge request review.
Ivan Tashkinov [Sat, 29 Feb 2020 19:04:09 +0000 (22:04 +0300)]
[#2250] Tiny refactoring per merge request review.

4 years agoMerge branch 'chore/update-cachex' into 'develop'
rinpatch [Sat, 29 Feb 2020 17:58:48 +0000 (17:58 +0000)]
Merge branch 'chore/update-cachex' into 'develop'

deps: update cachex to 3.2.0

See merge request pleroma/pleroma!2259

4 years agodeps: update cachex to 3.2.0
rinpatch [Sat, 29 Feb 2020 17:40:23 +0000 (20:40 +0300)]
deps: update cachex to 3.2.0

4 years agoMerge branch 'mastofe/bundle-2020-01-20' into 'develop'
rinpatch [Sat, 29 Feb 2020 16:31:31 +0000 (16:31 +0000)]
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'

MastoFE: Bundle 2020-01-20

See merge request pleroma/pleroma!2257

4 years agoMerge branch 'descriptions-changes' into 'develop'
Haelwenn [Sat, 29 Feb 2020 11:29:45 +0000 (11:29 +0000)]
Merge branch 'descriptions-changes' into 'develop'

Adding streamer group & Oban crontab child to descriptions.exs

Closes #1592

See merge request pleroma/pleroma!2258

4 years agoMerge branch 'develop' into gun
Alexander Strizhakov [Sat, 29 Feb 2020 08:34:50 +0000 (11:34 +0300)]
Merge branch 'develop' into gun

4 years agostreamer group & Oban crontab child
Alexander Strizhakov [Sat, 29 Feb 2020 08:24:30 +0000 (11:24 +0300)]
streamer group & Oban crontab child

4 years agoMastoFE: Bundle 2020-01-20
Haelwenn (lanodan) Monnier [Sat, 29 Feb 2020 05:41:13 +0000 (06:41 +0100)]
MastoFE: Bundle 2020-01-20

4 years agoMerge branch 'update/pleroma-fe-20200228' into 'develop'
feld [Fri, 28 Feb 2020 23:28:58 +0000 (23:28 +0000)]
Merge branch 'update/pleroma-fe-20200228' into 'develop'

Update PleromaFE bundle for the 2.0 release

See merge request pleroma/pleroma!2255

4 years agoMerge branch 'develop' into update/pleroma-fe-20200228
Mark Felder [Fri, 28 Feb 2020 22:18:09 +0000 (16:18 -0600)]
Merge branch 'develop' into update/pleroma-fe-20200228

4 years agoUpdate PleromaFE bundle for the 2.0 release
Mark Felder [Fri, 28 Feb 2020 22:15:12 +0000 (16:15 -0600)]
Update PleromaFE bundle for the 2.0 release

4 years agoMerge branch 'update/admin-fe-20200228' into 'develop'
feld [Fri, 28 Feb 2020 18:40:22 +0000 (18:40 +0000)]
Merge branch 'update/admin-fe-20200228' into 'develop'

Update AdminFE build

See merge request pleroma/pleroma!2254

4 years agoUpdate AdminFE build
Mark Felder [Fri, 28 Feb 2020 18:32:44 +0000 (12:32 -0600)]
Update AdminFE build

- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements

4 years agoApply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
Ivan Tashkinov [Fri, 28 Feb 2020 13:33:42 +0000 (13:33 +0000)]
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex

4 years agoMerge branch 'filtered-params' into 'develop'
Haelwenn [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
Merge branch 'filtered-params' into 'develop'

add confirm field to filtered params

See merge request pleroma/pleroma!2251

4 years agoadd confirm field to filtered params
Steven Fuchs [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
add confirm field to filtered params

4 years agoMerge branch 'descriptions-changes' into 'develop'
feld [Thu, 27 Feb 2020 18:11:26 +0000 (18:11 +0000)]
Merge branch 'descriptions-changes' into 'develop'

Removing unnecessary groups from descriptions.exs

See merge request pleroma/pleroma!2247

4 years agoMerge branch 'admin-status-list' into 'develop'
feld [Thu, 27 Feb 2020 18:11:04 +0000 (18:11 +0000)]
Merge branch 'admin-status-list' into 'develop'

Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192

4 years agoMerge branch 'exclude-boosts-admin-api' into 'develop'
feld [Thu, 27 Feb 2020 18:09:19 +0000 (18:09 +0000)]
Merge branch 'exclude-boosts-admin-api' into 'develop'

Admin API: filter out boosts from recent statuses

Closes #1589

See merge request pleroma/pleroma!2248

4 years agoRuntime configurability of RateLimiter. Refactoring. Disabled default rate limits...
Ivan Tashkinov [Thu, 27 Feb 2020 15:46:05 +0000 (18:46 +0300)]
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.

4 years agoAdmin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses`...
eugenijm [Wed, 26 Feb 2020 11:47:19 +0000 (14:47 +0300)]
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`

4 years agoAdmin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode...
eugenijm [Mon, 10 Feb 2020 11:32:38 +0000 (14:32 +0300)]
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)

4 years agounnecessary groups
Alexander Strizhakov [Wed, 26 Feb 2020 16:50:07 +0000 (19:50 +0300)]
unnecessary groups

4 years agoMerge branch 'feat/instance-gen-improvements' into 'develop'
lain [Wed, 26 Feb 2020 08:26:16 +0000 (08:26 +0000)]
Merge branch 'feat/instance-gen-improvements' into 'develop'

small instance.gen task improvements

See merge request pleroma/pleroma!2245

4 years agoinstance.gen task: make example instance name less confusing
rinpatch [Tue, 25 Feb 2020 21:32:34 +0000 (00:32 +0300)]
instance.gen task: make example instance name less confusing

See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217

4 years agoinstance.gen task: remind to transfer the config to the database after
rinpatch [Tue, 25 Feb 2020 19:13:08 +0000 (22:13 +0300)]
instance.gen task: remind to transfer the config to the database after
migrations

4 years agoinstance.gen task: make instance name default to the domain
rinpatch [Tue, 25 Feb 2020 18:59:37 +0000 (21:59 +0300)]
instance.gen task: make instance name default to the domain

4 years agoMerge branch 'fix/dialyzer-warnings' into 'develop'
rinpatch [Tue, 25 Feb 2020 18:56:37 +0000 (18:56 +0000)]
Merge branch 'fix/dialyzer-warnings' into 'develop'

Fix Dialyzer warnings

See merge request pleroma/pleroma!2242

4 years agoMerge branch 'merge/admin-fe-20200225' into 'develop'
feld [Tue, 25 Feb 2020 17:14:54 +0000 (17:14 +0000)]
Merge branch 'merge/admin-fe-20200225' into 'develop'

Update AdminFE build

See merge request pleroma/pleroma!2244

4 years agoUpdate AdminFE build
Mark Felder [Tue, 25 Feb 2020 17:08:35 +0000 (11:08 -0600)]
Update AdminFE build

4 years agoMerge branch 'token-web-push-test' into 'develop'
feld [Tue, 25 Feb 2020 16:06:06 +0000 (16:06 +0000)]
Merge branch 'token-web-push-test' into 'develop'

Add a test to ensure OAuth tokens are tied to Push subscriptions

Closes #1551

See merge request pleroma/pleroma!2241

4 years agosome docs
Alexander Strizhakov [Tue, 25 Feb 2020 16:01:29 +0000 (19:01 +0300)]
some docs

4 years agoFix Dialyzer warnings
Egor Kislitsyn [Tue, 25 Feb 2020 14:34:56 +0000 (18:34 +0400)]
Fix Dialyzer warnings

4 years agoAdd a test to ensure OAuth tokens are tied to Push subscriptions
Egor Kislitsyn [Tue, 25 Feb 2020 14:04:28 +0000 (18:04 +0400)]
Add a test to ensure OAuth tokens are tied to Push subscriptions

4 years agoMerge branch 'test-fix' into 'develop'
lain [Tue, 25 Feb 2020 12:26:39 +0000 (12:26 +0000)]
Merge branch 'test-fix' into 'develop'

Compile fix in tests

See merge request pleroma/pleroma!2239

4 years agocompile fix
Alexander Strizhakov [Tue, 25 Feb 2020 12:19:52 +0000 (15:19 +0300)]
compile fix

4 years agoDocument database default changes
lain [Tue, 25 Feb 2020 10:51:01 +0000 (11:51 +0100)]
Document database default changes

4 years agoAdd :unnamed option to default database configuration
lain [Tue, 25 Feb 2020 10:17:51 +0000 (11:17 +0100)]
Add :unnamed option to default database configuration