rinpatch [Sat, 11 Jan 2020 17:38:12 +0000 (17:38 +0000)]
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
rinpatch [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
Hakaba Hitoyo [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Remove MDII uploader
Alibek Omarov [Sat, 11 Jan 2020 05:06:40 +0000 (05:06 +0000)]
docs: API: update Mastodon API link
lain [Fri, 10 Jan 2020 13:14:20 +0000 (13:14 +0000)]
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
lain [Fri, 10 Jan 2020 13:07:20 +0000 (13:07 +0000)]
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
lain [Fri, 10 Jan 2020 11:09:07 +0000 (11:09 +0000)]
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
Mark Felder [Thu, 9 Jan 2020 21:45:46 +0000 (15:45 -0600)]
Fix captcha time, which was meant to be 5 minutes
feld [Thu, 9 Jan 2020 18:35:17 +0000 (18:35 +0000)]
Merge branch 'update/adminfe-
20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
Mark Felder [Thu, 9 Jan 2020 16:00:15 +0000 (10:00 -0600)]
Update AdminFE build
Maksim Pechnikov [Wed, 8 Jan 2020 13:40:38 +0000 (16:40 +0300)]
fix create service actor
rinpatch [Tue, 7 Jan 2020 11:43:22 +0000 (11:43 +0000)]
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
RX14 [Sun, 5 Jan 2020 19:00:48 +0000 (19:00 +0000)]
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
Ivan Tashkinov [Thu, 2 Jan 2020 10:03:33 +0000 (13:03 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
rinpatch [Sat, 28 Dec 2019 12:57:21 +0000 (12:57 +0000)]
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
Egor Kislitsyn [Sat, 28 Dec 2019 12:48:54 +0000 (19:48 +0700)]
Update `captcha` dependency
Haelwenn [Tue, 24 Dec 2019 19:57:41 +0000 (19:57 +0000)]
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
lain [Mon, 23 Dec 2019 16:31:15 +0000 (16:31 +0000)]
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
Egor Kislitsyn [Mon, 23 Dec 2019 08:14:46 +0000 (15:14 +0700)]
Increase CAPTCHA expiration time to 5 minutes
rinpatch [Sat, 21 Dec 2019 11:56:24 +0000 (11:56 +0000)]
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
rinpatch [Sat, 21 Dec 2019 11:49:35 +0000 (11:49 +0000)]
Merge branch 'revert-
a54aa5af' into 'develop'
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
Maxim Filippov [Sat, 21 Dec 2019 11:41:19 +0000 (11:41 +0000)]
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
feld [Fri, 20 Dec 2019 22:40:52 +0000 (22:40 +0000)]
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
Mark Felder [Fri, 20 Dec 2019 22:32:04 +0000 (16:32 -0600)]
Posts without media attachments should get the Summary TwitterCard
feld [Fri, 20 Dec 2019 16:30:26 +0000 (16:30 +0000)]
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
feld [Fri, 20 Dec 2019 16:30:00 +0000 (16:30 +0000)]
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
Haelwenn [Fri, 20 Dec 2019 13:24:24 +0000 (13:24 +0000)]
Merge branch 'remove-outdated-doc' into 'develop'
Remove `/api/account/register` documentation from pleroma_api.md
Closes #1486
See merge request pleroma/pleroma!2078
Egor Kislitsyn [Fri, 20 Dec 2019 12:47:44 +0000 (19:47 +0700)]
Remove `/api/account/register` documentation from pleroma_api.md
Maxim Filippov [Thu, 19 Dec 2019 16:52:55 +0000 (19:52 +0300)]
Fix all count
Maxim Filippov [Thu, 19 Dec 2019 16:47:36 +0000 (19:47 +0300)]
Expose issue via failing test
Ivan Tashkinov [Thu, 19 Dec 2019 14:24:08 +0000 (17:24 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Ivan Tashkinov [Thu, 19 Dec 2019 14:23:27 +0000 (17:23 +0300)]
[#2068] Introduced proper OAuth tokens usage to controller tests.
Egor Kislitsyn [Thu, 19 Dec 2019 12:25:23 +0000 (19:25 +0700)]
Do not crash when remote user follower and following counters are hidden
Maxim Filippov [Wed, 18 Dec 2019 20:11:42 +0000 (23:11 +0300)]
Stats: return status counts by scope
rinpatch [Tue, 17 Dec 2019 15:31:10 +0000 (15:31 +0000)]
Merge branch 'feature/add-event-support' into 'develop'
Add ActivityPub Object Event type support
See merge request pleroma/pleroma!2075
rinpatch [Tue, 17 Dec 2019 15:29:38 +0000 (15:29 +0000)]
Merge branch 'ci/rum-testing-no-recompilation' into 'develop'
CI: Add a cache policy for test jobs and fix rum tests recompiling everything
See merge request pleroma/pleroma!2074
rinpatch [Tue, 17 Dec 2019 15:24:16 +0000 (18:24 +0300)]
CI: Add a cache policy for test jobs and fix rum tests recompiling
everything
Thomas Citharel [Tue, 17 Dec 2019 15:16:21 +0000 (16:16 +0100)]
Add ActivityPub Object Event type support
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Haelwenn [Tue, 17 Dec 2019 06:43:15 +0000 (06:43 +0000)]
Merge branch 'hide-followers-count' into 'develop'
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
Egor Kislitsyn [Tue, 17 Dec 2019 06:34:07 +0000 (13:34 +0700)]
Hide follower counter when hiding is activated
lain [Mon, 16 Dec 2019 17:07:13 +0000 (17:07 +0000)]
Merge branch 'fix/remove-useless-sleep' into 'develop'
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
Egor Kislitsyn [Mon, 16 Dec 2019 15:34:21 +0000 (22:34 +0700)]
Merge branch 'develop' into feature/custom-runtime-modules
rinpatch [Mon, 16 Dec 2019 13:08:00 +0000 (13:08 +0000)]
Merge branch 'kocaptcha-default-endpoint' into 'develop'
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
Egor Kislitsyn [Mon, 16 Dec 2019 12:35:10 +0000 (19:35 +0700)]
Add Kocaptcha endpoint to config.exs
Egor Kislitsyn [Mon, 16 Dec 2019 12:33:51 +0000 (19:33 +0700)]
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
This reverts commit
82c62c5028f517ded121b46b9806053989defdc2.
Egor Kislitsyn [Mon, 16 Dec 2019 08:32:33 +0000 (15:32 +0700)]
Add default endpoint to Pleroma.Captcha.Kocaptcha
rinpatch [Sun, 15 Dec 2019 22:37:33 +0000 (01:37 +0300)]
formatting
rinpatch [Sun, 15 Dec 2019 22:22:01 +0000 (01:22 +0300)]
tests: significantly reduce streamer timeout
there is no reason IPC between two processes on the same node should
take 4 seconds
rinpatch [Sun, 15 Dec 2019 22:03:13 +0000 (01:03 +0300)]
tests: remove a useless sleep in rate limiter tests
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
rinpatch [Sun, 15 Dec 2019 21:51:59 +0000 (00:51 +0300)]
tests: remove a useless 1 second sleep
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
rinpatch [Sun, 15 Dec 2019 21:50:39 +0000 (00:50 +0300)]
tests: remove a useless 3 second sleep
the ids favs use are accurate down to a microsecond, there is no need
for it
rinpatch [Sun, 15 Dec 2019 21:48:49 +0000 (00:48 +0300)]
tests: Replace 2 second sleep with offseting updated_at
Ivan Tashkinov [Sun, 15 Dec 2019 19:32:42 +0000 (22:32 +0300)]
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
Haelwenn [Fri, 13 Dec 2019 14:58:35 +0000 (14:58 +0000)]
Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'
Publisher: check out a connection for inserting publish_one jobs
See merge request pleroma/pleroma!2063
rinpatch [Fri, 13 Dec 2019 11:27:10 +0000 (14:27 +0300)]
Publisher: check out a connection for inserting publish_one jobs
Related to #1474, federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
Egor Kislitsyn [Thu, 12 Dec 2019 18:51:52 +0000 (01:51 +0700)]
Merge branch 'develop' into feature/custom-runtime-modules
lain [Thu, 12 Dec 2019 18:43:21 +0000 (18:43 +0000)]
Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
lain [Thu, 12 Dec 2019 16:40:39 +0000 (16:40 +0000)]
Merge branch 'uguu' into 'develop'
Update frontend
See merge request pleroma/pleroma!2062
lain [Thu, 12 Dec 2019 16:05:22 +0000 (17:05 +0100)]
Update frontend
lain [Thu, 12 Dec 2019 13:26:39 +0000 (13:26 +0000)]
Merge branch '1427-oauth-graceful-admin-scope' into 'develop'
[#1427] Graceful clearance of OAuth admin scopes for non-admin users
Closes #1427
See merge request pleroma/pleroma!2061
Ivan Tashkinov [Thu, 12 Dec 2019 13:00:06 +0000 (16:00 +0300)]
[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
Egor Kislitsyn [Thu, 12 Dec 2019 11:04:52 +0000 (18:04 +0700)]
Add Kocaptcha endpoint to the test config
Egor Kislitsyn [Wed, 11 Dec 2019 15:29:31 +0000 (22:29 +0700)]
Add native captcha and enable it by default.
lain [Thu, 12 Dec 2019 09:46:16 +0000 (09:46 +0000)]
Merge branch 'revert-
bca1512d' into 'develop'
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
See merge request pleroma/pleroma!2059
lain [Thu, 12 Dec 2019 09:37:02 +0000 (09:37 +0000)]
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
This reverts merge request !2055
lain [Thu, 12 Dec 2019 09:31:50 +0000 (09:31 +0000)]
Merge branch 'test-timeout' into 'develop'
Fix intermittent failures in federated testing
See merge request pleroma/pleroma!2058
lain [Thu, 12 Dec 2019 09:28:27 +0000 (09:28 +0000)]
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
Egor Kislitsyn [Thu, 12 Dec 2019 07:37:57 +0000 (14:37 +0700)]
Remove runtime modules config example
feld [Wed, 11 Dec 2019 23:45:44 +0000 (23:45 +0000)]
Merge branch 'feature/report-notes' into 'develop'
AdminAPI: Add report notes
See merge request pleroma/pleroma!2031
Maxim Filippov [Wed, 11 Dec 2019 23:16:23 +0000 (02:16 +0300)]
Merge branch 'develop' into feature/report-notes
feld [Wed, 11 Dec 2019 22:37:16 +0000 (22:37 +0000)]
Merge branch 'issue/1411' into 'develop'
[#1411] /api/v1/favourites: added sorting for activites by adds to favorites
See merge request pleroma/pleroma!1991
Mark Felder [Wed, 11 Dec 2019 21:03:54 +0000 (15:03 -0600)]
Document the favorites timeline order change
Mark Felder [Wed, 11 Dec 2019 21:02:53 +0000 (15:02 -0600)]
Merge branch 'develop' into issue/1411
stwf [Wed, 11 Dec 2019 19:57:33 +0000 (14:57 -0500)]
try local sheduling
rinpatch [Wed, 11 Dec 2019 17:57:41 +0000 (17:57 +0000)]
Merge branch 'chore/fast_sanitize_bump' into 'develop'
mix.lock: update fast_sanitize
See merge request pleroma/pleroma!2056
rinpatch [Wed, 11 Dec 2019 17:42:08 +0000 (20:42 +0300)]
mix.lock: update fast_sanitize
the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.
rinpatch [Wed, 11 Dec 2019 17:38:16 +0000 (17:38 +0000)]
Merge branch 'admin-scope-support-code' into 'develop'
FE bundle updates: admin-fe and pleroma-fe
See merge request pleroma/pleroma!2055
Ivan Tashkinov [Wed, 11 Dec 2019 16:48:00 +0000 (19:48 +0300)]
Updated admin-fe bundle to
14cdc4a, pleroma-fe bundle to
abb6747f.
Maxim Filippov [Wed, 11 Dec 2019 15:57:36 +0000 (18:57 +0300)]
AdminAPI: Merge account views for list instance statuses
Egor Kislitsyn [Wed, 11 Dec 2019 15:32:53 +0000 (22:32 +0700)]
Update CHANGELOG
Egor Kislitsyn [Wed, 11 Dec 2019 10:46:07 +0000 (17:46 +0700)]
Set log level to debug for not important messages
rinpatch [Wed, 11 Dec 2019 09:57:00 +0000 (09:57 +0000)]
Merge branch 'domain-block-precedence' into 'develop'
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
Sadposter [Wed, 11 Dec 2019 09:08:20 +0000 (09:08 +0000)]
remove single-step pipe
lain [Wed, 11 Dec 2019 08:50:43 +0000 (08:50 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
Ivan Tashkinov [Wed, 11 Dec 2019 08:42:02 +0000 (11:42 +0300)]
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
Sadposter [Tue, 10 Dec 2019 18:49:41 +0000 (18:49 +0000)]
Apply suggestion to lib/pleroma/user.ex
feld [Tue, 10 Dec 2019 17:25:56 +0000 (17:25 +0000)]
Merge branch 'fix/unsubscribe-route' into 'develop'
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
Sadposter [Tue, 10 Dec 2019 16:54:25 +0000 (16:54 +0000)]
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
Sadposter [Tue, 10 Dec 2019 16:50:58 +0000 (16:50 +0000)]
make analysis happy
Sadposter [Tue, 10 Dec 2019 16:41:43 +0000 (16:41 +0000)]
format activity_pub.ex
Sadposter [Tue, 10 Dec 2019 16:40:12 +0000 (16:40 +0000)]
modify SQL to include followed-but-domain-blocked activities
Egor Kislitsyn [Tue, 10 Dec 2019 14:46:02 +0000 (21:46 +0700)]
Do not apply http signature pipeline to the unsubscribe route
lain [Tue, 10 Dec 2019 13:44:06 +0000 (13:44 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] OAuth admin scopes
Closes #1427
See merge request pleroma/pleroma!2025
minibikini [Tue, 10 Dec 2019 13:38:25 +0000 (13:38 +0000)]
Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
# CHANGELOG.md
lain [Tue, 10 Dec 2019 13:34:54 +0000 (13:34 +0000)]
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
lain [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
[ActivityPub] Configurable ActivityPub actor type
See merge request pleroma/pleroma!2005
Hakaba Hitoyo [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
[ActivityPub] Configurable ActivityPub actor type
Egor Kislitsyn [Tue, 10 Dec 2019 08:08:57 +0000 (15:08 +0700)]
Change log level
Ivan Tashkinov [Tue, 10 Dec 2019 05:55:14 +0000 (08:55 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
rinpatch [Mon, 9 Dec 2019 20:35:05 +0000 (20:35 +0000)]
Merge branch 'fix/load_config' into 'develop'
fixed loads a config variable with large value from db
See merge request pleroma/pleroma!2051
projects / akkoma / log