darkkirb/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7664 commits 10 branches 75 tags 305 MiB
Commit graph

7664 commits

This branch
This branch
All branches
Author SHA1 Message Date
kPherox
b7bbb5445d
remove docs/ from .dockerignore 2019-11-20 00:09:07 +09:00
Maxim Filippov
b88dbc17c8 Fix tests 2019-11-19 22:50:24 +09:00
lain
bf89e0bf38 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
 2019-11-19 13:16:49 +00:00
Maxim Filippov
46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header 2019-11-19 15:58:20 +07:00
feld
06151776c0 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
 2019-11-18 16:16:27 +00:00
feld
adacf1b5e1 Remove deprecated endpoint from docs that is fully removed from backend now 2019-11-18 16:16:27 +00:00
rinpatch
4df2d64b9f Merge branch 'chore/bump-fast-sanitize' into 'develop' 
Bump fast_sanitize

See merge request pleroma/pleroma!1988
 2019-11-16 17:49:49 +00:00
rinpatch
fad296e432 Bump fast_sanitize 2019-11-16 19:19:25 +03:00
Maxim Filippov
c506cc48ef Admin API: Error when trying to update reports in the "old" format 2019-11-16 18:44:48 +09:00
rinpatch
a869c718ab Merge branch 'chore/changelog-sync-' into 'develop' 
Sync the changelogs between develop and stable

See merge request pleroma/pleroma!1985
 2019-11-15 22:03:28 +00:00
rinpatch
da28bf8fdd Sync the changelogs between develop and stable 2019-11-16 01:02:08 +03:00
kaniini
81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop' 
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
 2019-11-15 20:29:38 +00:00
rinpatch
9e3868425a Merge branch 'mix-task-warning' into 'develop' 
Documentation: Add warning about database mix tasks.

See merge request pleroma/pleroma!1984
 2019-11-15 19:38:52 +00:00
kPherox
c9a06b14ab Add test 2019-11-15 23:55:28 +09:00
rinpatch
22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop' 
Bugfix/1395 email activation

Closes #1395

See merge request pleroma/pleroma!1965
 2019-11-15 14:11:48 +00:00
lain
234c27cb20 Documentation: Add warning about database mix tasks. 2019-11-15 14:30:59 +01:00
lain
f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-15 14:13:21 +01:00
lain
13b6aefd59 Merge branch 'feature/mrf-object-age-policy' into 'develop' 
MRF: add ObjectAgePolicy

See merge request pleroma/pleroma!1982
 2019-11-15 12:44:54 +00:00
lain
075789c442 Apply suggestion to CHANGELOG.md 2019-11-15 12:31:09 +00:00
kPherox
72d2557e11 Add fieldsLimit to metadata of nodeinfo 2019-11-15 18:52:31 +09:00
Ariadne Conill
7c59bc9ef9 fix credo 2019-11-14 20:18:45 -06:00
Ariadne Conill
eecd64cc07 object age policy: remove debug logging 2019-11-14 19:56:14 -06:00
Ariadne Conill
2469880a2b add changelog entry for MRF ObjectAgePolicy 2019-11-14 19:49:25 -06:00
Ariadne Conill
5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported 2019-11-14 19:48:10 -06:00
Ariadne Conill
29f49bf5fa docs: document MRF ObjectAgePolicy 2019-11-14 19:47:54 -06:00
Ariadne Conill
1d33eeca72 config: add configuration for MRF ObjectAgePolicy 2019-11-14 18:26:06 -06:00
Maxim Filippov
114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330 Admin API: list all statuses from a given instance 2019-11-14 23:44:07 +09:00
rinpatch
09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop' 
Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973
 2019-11-14 14:40:37 +00:00
rinpatch
94f1cfced8 format the code 2019-11-14 17:26:59 +03:00
feld
1afeaf82fa 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
 2019-11-14 13:35:41 +00:00
rinpatch
574369b42d Merge branch 'ci/disable-trace' into 'develop' 
ci: disable --trace for unit tests

See merge request pleroma/pleroma!1980
 2019-11-14 13:26:15 +00:00
rinpatch
2861f97e46 ci: disable --trace for unit tests 
it is mostly useless, but makes failures harder to find
 2019-11-14 16:06:08 +03:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +00:00
lain
7a322713c3 Update CHANGELOG.md 2019-11-14 08:21:06 +00:00
lain
f74bb1d0fc 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
 2019-11-13 17:37:48 +00:00
Phil Hagelberg
3c60adbc1f Support redirecting by activity UUID in static FE as well. 2019-11-13 08:22:11 -08:00
Phil Hagelberg
0867cb083e Support redirecting by object ID in static FE. 
This matches the behavior of pleroma-fe better.

Fixes #1412.
 2019-11-13 08:02:02 -08:00
lain
60cc5a7750 Merge branch 'fix-rate-limiter-test' into 'develop' 
Fix random fails of the rate limiter tests (hopefully)

See merge request pleroma/pleroma!1978
 2019-11-13 14:27:37 +00:00
rinpatch
24d5f9cbe0 Merge branch 'fix-docs-formatting' into 'develop' 
Fix formatting in OpenBSD install manual

See merge request pleroma/pleroma!1979
 2019-11-13 12:08:11 +00:00
Egor Kislitsyn
3350cd8d96
Fix formatting in OpenBSD install manual 2019-11-13 18:49:29 +07:00
Egor Kislitsyn
72cf6a76f4
Fix random fails of the rate limiter tests 2019-11-13 18:07:53 +07:00
lain
facc37aaa6 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
 2019-11-13 10:16:00 +00:00
rinpatch
1025c526c0 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
 2019-11-13 10:08:07 +00:00
Phil Hagelberg
62f3a93049 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.
 2019-11-12 09:40:29 -08:00
lain
e835cd97f6 Containment: Add a catch-all clause to contain_origin. 2019-11-12 12:07:17 +01:00
Mark Felder
7d101bc9c5 Fix rendering conversations when there's a malformed status 2019-11-11 18:29:55 -06:00
rinpatch
fb090b748a Merge branch 'fix/docs-static-fe-category' into 'develop' 
docs: move static-fe docs under a proper category

See merge request pleroma/pleroma!1972
 2019-11-11 20:25:48 +00:00
rinpatch
04473677cc docs: move static-fe docs under a proper category 2019-11-11 23:24:15 +03:00