Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,584 Commits 1 Branch 0 Tags 222 MiB
2469880a2b
Commit Graph

7584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
feld
e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop' 
report federating status in nodeinfo

See merge request pleroma/pleroma!1971
 2019-11-11 19:14:06 +00:00
kaniini
2cc043591c Merge branch 'feature/static-fe' into 'develop' 
Static frontend

See merge request pleroma/pleroma!1917
 2019-11-11 19:10:44 +00:00
href
b39b49cc14 report federating status in nodeinfo 2019-11-11 19:03:43 +01:00
lain
55ac38c1d2 Merge branch 'fix-dokku-2' into 'develop' 
Dokku deploys: Keep the git dir so version number generation works.

See merge request pleroma/pleroma!1967
 2019-11-11 15:01:31 +00:00
rinpatch
51f40fab00 Merge branch 'patch-1' into 'develop' 
Default config: Use extended nickname format

See merge request pleroma/pleroma!1968
 2019-11-11 14:09:46 +00:00
rinpatch
54ae688fa1 Merge branch 'chore/changelog-1940' into 'develop' 
Add a changelog entry for !1940

See merge request pleroma/pleroma!1970
 2019-11-11 14:07:23 +00:00
rinpatch
827b938502 Add a changelog entry for !1940 2019-11-11 17:05:30 +03:00
lain
4690cf6394 Merge branch 'update-ci' into 'develop' 
Use PG12 in CI for the RUM pipeline

Closes #1377

See merge request pleroma/pleroma!1969
 2019-11-11 13:13:20 +00:00
lain
72cc92259e Default config: Use extended nickname format 2019-11-11 12:49:18 +00:00
Egor Kislitsyn
7ba30cf8b6
Use PG12 in CI for the RUM pipeline 2019-11-11 19:47:33 +07:00
lain
86d821a96e Dokku deploys: Keep the git dir so version number generation works. 2019-11-11 13:37:56 +01:00
lain
c90972c5bd Merge branch 'update-docs' into 'develop' 
Add a warning about Pg version to the RUM related docs

See merge request pleroma/pleroma!1966
 2019-11-11 12:34:17 +00:00
lain
1ca7b877a1 Merge branch 'iss-1376' into 'develop' 
Check client and token in GET /oauth/authorize

See merge request pleroma/pleroma!1940
 2019-11-11 12:27:33 +00:00
lain
417f9a782f Merge branch 'fix/1399' into 'develop' 
fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964
 2019-11-11 12:13:45 +00:00
Egor Kislitsyn
ab2e61238e
Add a warning about Pg version to the RUM related docs 2019-11-11 19:13:07 +07:00
lain
e73cc742b9 Merge branch 'new-rate-limiter' into 'develop' 
New rate limiter

See merge request pleroma/pleroma!1946
 2019-11-11 12:13:06 +00:00
Steven Fuchs
94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
Maxim Filippov
46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-11 19:18:12 +09:00
Maxim Filippov
1649d6f689 Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry 2019-11-11 19:16:04 +09:00
Maxim Filippov
31343e4321 Code style fixes 2019-11-11 19:06:09 +09:00
Maxim Filippov
b2e8371e6a Apply suggestion to CHANGELOG.md 2019-11-11 09:55:00 +00:00
Alexander
6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
lain
7438c177d9 Merge branch 'disable-attachment-links' into 'develop' 
Disable attachment links by default

Closes #1394

See merge request pleroma/pleroma!1962
 2019-11-10 14:25:09 +00:00
rinpatch
4499a7a075 Disable attachment links by default 
Closes #1394
 2019-11-10 15:02:47 +03:00
lain
a88e834dba Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-11-10 11:32:50 +00:00