Maxim Filippov [Fri, 22 Nov 2019 04:35:21 +0000 (13:35 +0900)]
AdminAPI: Grouped reports old/new fix
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
Maxim Filippov [Sun, 24 Nov 2019 16:39:35 +0000 (01:39 +0900)]
AdminAPI: Fix grouped reports for closed/resolved reports
Maxim Filippov [Sun, 24 Nov 2019 15:05:52 +0000 (00:05 +0900)]
Typo
Maxim Filippov [Sun, 24 Nov 2019 15:04:29 +0000 (00:04 +0900)]
Admin API: Render whole status in grouped reports
lain [Wed, 20 Nov 2019 12:46:33 +0000 (12:46 +0000)]
Merge branch 'fix/sporadic-tests' into 'develop'
Fix sporadically failing test
Closes #1432
See merge request pleroma/pleroma!1999
lain [Wed, 20 Nov 2019 10:32:58 +0000 (10:32 +0000)]
Merge branch 'fix-docker-build' into 'develop'
Fix failing docker build
See merge request pleroma/pleroma!1998
Egor Kislitsyn [Wed, 20 Nov 2019 07:25:00 +0000 (14:25 +0700)]
Fix sporadically failing test
rinpatch [Tue, 19 Nov 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'chore/bump-fe' into 'develop'
Bump fe and sync changelogs
See merge request pleroma/pleroma!1996
rinpatch [Tue, 19 Nov 2019 21:01:58 +0000 (00:01 +0300)]
changelog: add 1.1.6 entries from stable
rinpatch [Tue, 19 Nov 2019 16:45:20 +0000 (19:45 +0300)]
kPherox [Tue, 19 Nov 2019 14:52:47 +0000 (23:52 +0900)]
remove docs/ from .dockerignore
lain [Tue, 19 Nov 2019 13:16:49 +0000 (13:16 +0000)]
Merge branch 'feature/admin-api/support-token-header' into 'develop'
Admin API: Support authentication via `x-admin-token` HTTP header
Closes #1430
See merge request pleroma/pleroma!1993
Egor Kislitsyn [Tue, 19 Nov 2019 08:58:20 +0000 (15:58 +0700)]
Support authentication via `x-admin-token` HTTP header
feld [Mon, 18 Nov 2019 16:16:27 +0000 (16:16 +0000)]
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'
Remove deprecated endpoint from docs that is fully removed from backend now
See merge request pleroma/pleroma!1992
feld [Mon, 18 Nov 2019 16:16:27 +0000 (16:16 +0000)]
Remove deprecated endpoint from docs that is fully removed from backend now
rinpatch [Sat, 16 Nov 2019 17:49:49 +0000 (17:49 +0000)]
Merge branch 'chore/bump-fast-sanitize' into 'develop'
Bump fast_sanitize
See merge request pleroma/pleroma!1988
rinpatch [Sat, 16 Nov 2019 16:19:25 +0000 (19:19 +0300)]
Bump fast_sanitize
rinpatch [Fri, 15 Nov 2019 22:03:28 +0000 (22:03 +0000)]
Merge branch 'chore/changelog-sync-' into 'develop'
Sync the changelogs between develop and stable
See merge request pleroma/pleroma!1985
rinpatch [Fri, 15 Nov 2019 22:02:08 +0000 (01:02 +0300)]
Sync the changelogs between develop and stable
kaniini [Fri, 15 Nov 2019 20:29:38 +0000 (20:29 +0000)]
Merge branch 'nodeinfo-fields-limit' into 'develop'
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
rinpatch [Fri, 15 Nov 2019 19:38:52 +0000 (19:38 +0000)]
Merge branch 'mix-task-warning' into 'develop'
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
kPherox [Fri, 15 Nov 2019 14:55:28 +0000 (23:55 +0900)]
Add test
rinpatch [Fri, 15 Nov 2019 14:11:48 +0000 (14:11 +0000)]
Merge branch 'bugfix/1395-email-activation' into 'develop'
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
lain [Fri, 15 Nov 2019 13:30:59 +0000 (14:30 +0100)]
Documentation: Add warning about database mix tasks.
lain [Fri, 15 Nov 2019 13:13:21 +0000 (14:13 +0100)]
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
lain [Fri, 15 Nov 2019 12:44:54 +0000 (12:44 +0000)]
Merge branch 'feature/mrf-object-age-policy' into 'develop'
MRF: add ObjectAgePolicy
See merge request pleroma/pleroma!1982
lain [Fri, 15 Nov 2019 12:31:09 +0000 (12:31 +0000)]
Apply suggestion to CHANGELOG.md
kPherox [Fri, 15 Nov 2019 09:51:55 +0000 (18:51 +0900)]
Add fieldsLimit to metadata of nodeinfo
Ariadne Conill [Fri, 15 Nov 2019 02:18:45 +0000 (20:18 -0600)]
fix credo
Ariadne Conill [Fri, 15 Nov 2019 01:56:14 +0000 (19:56 -0600)]
object age policy: remove debug logging
Ariadne Conill [Fri, 15 Nov 2019 01:49:25 +0000 (19:49 -0600)]
add changelog entry for MRF ObjectAgePolicy
Ariadne Conill [Fri, 15 Nov 2019 01:48:10 +0000 (19:48 -0600)]
MRF: add ObjectAgePolicy which deals with old posts being imported
Ariadne Conill [Fri, 15 Nov 2019 00:31:30 +0000 (18:31 -0600)]
docs: document MRF ObjectAgePolicy
Ariadne Conill [Fri, 15 Nov 2019 00:26:06 +0000 (18:26 -0600)]
config: add configuration for MRF ObjectAgePolicy
rinpatch [Thu, 14 Nov 2019 14:40:37 +0000 (14:40 +0000)]
Merge branch 'fix/conversations-rendering' into 'develop'
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
rinpatch [Thu, 14 Nov 2019 14:26:59 +0000 (17:26 +0300)]
format the code
feld [Thu, 14 Nov 2019 13:35:41 +0000 (13:35 +0000)]
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
rinpatch [Thu, 14 Nov 2019 13:26:15 +0000 (13:26 +0000)]
Merge branch 'ci/disable-trace' into 'develop'
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
rinpatch [Thu, 14 Nov 2019 13:06:08 +0000 (16:06 +0300)]
ci: disable --trace for unit tests
it is mostly useless, but makes failures harder to find
rinpatch [Thu, 14 Nov 2019 08:47:10 +0000 (08:47 +0000)]
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
lain [Thu, 14 Nov 2019 08:21:06 +0000 (08:21 +0000)]
Update CHANGELOG.md
lain [Wed, 13 Nov 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'static-fe-object-id' into 'develop'
Redirect object/activity ID to notice in static-fe
Closes #1412
See merge request pleroma/pleroma!1977
Phil Hagelberg [Wed, 13 Nov 2019 01:33:54 +0000 (17:33 -0800)]
Support redirecting by activity UUID in static FE as well.
Phil Hagelberg [Wed, 13 Nov 2019 01:19:46 +0000 (17:19 -0800)]
Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.
Fixes #1412.
lain [Wed, 13 Nov 2019 14:27:37 +0000 (14:27 +0000)]
Merge branch 'fix-rate-limiter-test' into 'develop'
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
rinpatch [Wed, 13 Nov 2019 12:08:11 +0000 (12:08 +0000)]
Merge branch 'fix-docs-formatting' into 'develop'
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
Egor Kislitsyn [Wed, 13 Nov 2019 11:48:53 +0000 (18:48 +0700)]
Fix formatting in OpenBSD install manual
Egor Kislitsyn [Wed, 13 Nov 2019 11:07:53 +0000 (18:07 +0700)]
Fix random fails of the rate limiter tests
lain [Wed, 13 Nov 2019 10:16:00 +0000 (10:16 +0000)]
Merge branch 'static-remote-redirect' into 'develop'
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
rinpatch [Wed, 13 Nov 2019 10:08:07 +0000 (10:08 +0000)]
Merge branch 'bugfix/1360-actorless-posts' into 'develop'
Containment: Add a catch-all clause to contain_origin.
Closes #1360
See merge request pleroma/pleroma!1975
Phil Hagelberg [Tue, 12 Nov 2019 01:16:44 +0000 (17:16 -0800)]
For remote notices, redirect to the original instead of 404.
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
lain [Tue, 12 Nov 2019 11:07:17 +0000 (12:07 +0100)]
Containment: Add a catch-all clause to contain_origin.
Mark Felder [Tue, 12 Nov 2019 00:29:55 +0000 (18:29 -0600)]
Fix rendering conversations when there's a malformed status
rinpatch [Mon, 11 Nov 2019 20:25:48 +0000 (20:25 +0000)]
Merge branch 'fix/docs-static-fe-category' into 'develop'
docs: move static-fe docs under a proper category
See merge request pleroma/pleroma!1972
rinpatch [Mon, 11 Nov 2019 20:24:15 +0000 (23:24 +0300)]
docs: move static-fe docs under a proper category
feld [Mon, 11 Nov 2019 19:14:06 +0000 (19:14 +0000)]
Merge branch 'nodeinfo-federation-enabled' into 'develop'
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
kaniini [Mon, 11 Nov 2019 19:10:44 +0000 (19:10 +0000)]
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
href [Mon, 11 Nov 2019 18:03:43 +0000 (19:03 +0100)]
report federating status in nodeinfo
lain [Mon, 11 Nov 2019 15:01:31 +0000 (15:01 +0000)]
Merge branch 'fix-dokku-2' into 'develop'
Dokku deploys: Keep the git dir so version number generation works.
See merge request pleroma/pleroma!1967
rinpatch [Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)]
Merge branch 'patch-1' into 'develop'
Default config: Use extended nickname format
See merge request pleroma/pleroma!1968
rinpatch [Mon, 11 Nov 2019 14:07:23 +0000 (14:07 +0000)]
Merge branch 'chore/changelog-1940' into 'develop'
Add a changelog entry for !1940
See merge request pleroma/pleroma!1970
rinpatch [Mon, 11 Nov 2019 14:05:30 +0000 (17:05 +0300)]
Add a changelog entry for !1940
lain [Mon, 11 Nov 2019 13:13:20 +0000 (13:13 +0000)]
Merge branch 'update-ci' into 'develop'
Use PG12 in CI for the RUM pipeline
Closes #1377
See merge request pleroma/pleroma!1969
lain [Mon, 11 Nov 2019 12:49:18 +0000 (12:49 +0000)]
Default config: Use extended nickname format
Egor Kislitsyn [Mon, 11 Nov 2019 12:47:33 +0000 (19:47 +0700)]
Use PG12 in CI for the RUM pipeline
lain [Mon, 11 Nov 2019 12:37:56 +0000 (13:37 +0100)]
Dokku deploys: Keep the git dir so version number generation works.
lain [Mon, 11 Nov 2019 12:34:17 +0000 (12:34 +0000)]
Merge branch 'update-docs' into 'develop'
Add a warning about Pg version to the RUM related docs
See merge request pleroma/pleroma!1966
lain [Mon, 11 Nov 2019 12:27:33 +0000 (12:27 +0000)]
Merge branch 'iss-1376' into 'develop'
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
lain [Mon, 11 Nov 2019 12:13:45 +0000 (12:13 +0000)]
Merge branch 'fix/1399' into 'develop'
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
Egor Kislitsyn [Mon, 11 Nov 2019 12:13:07 +0000 (19:13 +0700)]
Add a warning about Pg version to the RUM related docs
lain [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
Merge branch 'new-rate-limiter' into 'develop'
New rate limiter
See merge request pleroma/pleroma!1946
Steven Fuchs [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
New rate limiter
lain [Mon, 11 Nov 2019 11:43:46 +0000 (12:43 +0100)]
UserEnabledPlug: Don't authenticate unconfirmed users.
lain [Mon, 11 Nov 2019 11:37:13 +0000 (12:37 +0100)]
User: Don't let deactivated users authenticate.
Maxim Filippov [Mon, 11 Nov 2019 10:18:12 +0000 (19:18 +0900)]
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Maxim Filippov [Mon, 11 Nov 2019 10:16:04 +0000 (19:16 +0900)]
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
Maxim Filippov [Mon, 11 Nov 2019 10:06:09 +0000 (19:06 +0900)]
Code style fixes
Maxim Filippov [Mon, 11 Nov 2019 09:55:00 +0000 (09:55 +0000)]
Apply suggestion to CHANGELOG.md
Alexander [Sun, 10 Nov 2019 19:54:37 +0000 (22:54 +0300)]
fix for migrate task
lain [Sun, 10 Nov 2019 14:25:09 +0000 (14:25 +0000)]
Merge branch 'disable-attachment-links' into 'develop'
Disable attachment links by default
Closes #1394
See merge request pleroma/pleroma!1962
rinpatch [Sun, 10 Nov 2019 12:02:47 +0000 (15:02 +0300)]
Disable attachment links by default
Closes #1394
lain [Sun, 10 Nov 2019 11:32:50 +0000 (11:32 +0000)]
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
lain [Sun, 10 Nov 2019 11:20:20 +0000 (11:20 +0000)]
Merge branch 'issue/1339' into 'develop'
[#1339] add subject to atom feed
See merge request pleroma/pleroma!1961
lain [Sun, 10 Nov 2019 11:02:34 +0000 (11:02 +0000)]
Apply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 10:44:23 +0000 (10:44 +0000)]
Apply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 10:30:52 +0000 (10:30 +0000)]
Merge branch 'refactor/readme' into 'develop'
Partial readme rewrite
See merge request pleroma/pleroma!1958
Maksim Pechnikov [Fri, 8 Nov 2019 06:23:24 +0000 (09:23 +0300)]
add subject to atom feed
Phil Hagelberg [Sun, 10 Nov 2019 02:26:19 +0000 (18:26 -0800)]
Formatter moved to new module.
Phil Hagelberg [Sat, 9 Nov 2019 17:50:45 +0000 (09:50 -0800)]
Add changelog entry, cheatsheet docs, and alphabetize.
Phil Hagelberg [Fri, 8 Nov 2019 16:55:32 +0000 (08:55 -0800)]
Add some further test cases.
Including like ... private visibility, cos that's super important.
Phil Hagelberg [Fri, 8 Nov 2019 06:29:46 +0000 (22:29 -0800)]
Add tests for static_fe controller.
Phil Hagelberg [Fri, 8 Nov 2019 05:43:21 +0000 (21:43 -0800)]
Prevent non-local notices from rendering.
Phil Hagelberg [Fri, 8 Nov 2019 03:31:28 +0000 (19:31 -0800)]
Move static_fe config to its own section instead of in :instance.
Phil Hagelberg [Wed, 6 Nov 2019 06:00:19 +0000 (22:00 -0800)]
Render errors in HTML, not with JS.
Phil Hagelberg [Wed, 6 Nov 2019 05:37:46 +0000 (21:37 -0800)]
Expand subject content automatically when config is set.
Phil Hagelberg [Wed, 6 Nov 2019 05:28:36 +0000 (21:28 -0800)]
Include metadata in static FE conversations and profiles.
Phil Hagelberg [Tue, 5 Nov 2019 06:56:51 +0000 (22:56 -0800)]
Catch 404s.
Phil Hagelberg [Tue, 5 Nov 2019 06:49:05 +0000 (22:49 -0800)]
Pagination for user profiles.
Phil Hagelberg [Tue, 5 Nov 2019 06:02:10 +0000 (22:02 -0800)]
Make many of the improvements suggested in review.
Phil Hagelberg [Sun, 3 Nov 2019 20:29:17 +0000 (12:29 -0800)]
Static FE plug should only respond to text/html requests.
projects / akkoma / log