46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
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
5 years ago
94f1cfced8
format the code
5 years ago
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
5 years ago
574369b42d
Merge branch 'ci/disable-trace' into 'develop'
...
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
5 years ago
2861f97e46
ci: disable --trace for unit tests
...
it is mostly useless, but makes failures harder to find
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
7a322713c3
Update CHANGELOG.md
5 years ago
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
5 years ago
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
60cc5a7750
Merge branch 'fix-rate-limiter-test' into 'develop'
...
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
5 years ago
24d5f9cbe0
Merge branch 'fix-docs-formatting' into 'develop'
...
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
5 years ago
3350cd8d96
Fix formatting in OpenBSD install manual
5 years ago
72cf6a76f4
Fix random fails of the rate limiter tests
5 years ago
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
5 years ago
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
5 years ago
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.
5 years ago
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
5 years ago
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
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
5 years ago
04473677cc
docs: move static-fe docs under a proper category
5 years ago
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
b39b49cc14
report federating status in nodeinfo
5 years ago
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
5 years ago
51f40fab00
Merge branch 'patch-1' into 'develop'
...
Default config: Use extended nickname format
See merge request pleroma/pleroma!1968
5 years ago
54ae688fa1
Merge branch 'chore/changelog-1940' into 'develop'
...
Add a changelog entry for !1940
See merge request pleroma/pleroma!1970
5 years ago
827b938502
Add a changelog entry for !1940
5 years ago
4690cf6394
Merge branch 'update-ci' into 'develop'
...
Use PG12 in CI for the RUM pipeline
Closes #1377
See merge request pleroma/pleroma!1969
5 years ago
72cc92259e
Default config: Use extended nickname format
5 years ago
7ba30cf8b6
Use PG12 in CI for the RUM pipeline
5 years ago
86d821a96e
Dokku deploys: Keep the git dir so version number generation works.
5 years ago
c90972c5bd
Merge branch 'update-docs' into 'develop'
...
Add a warning about Pg version to the RUM related docs
See merge request pleroma/pleroma!1966
5 years ago
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
5 years ago
ab2e61238e
Add a warning about Pg version to the RUM related docs
5 years ago
e73cc742b9
Merge branch 'new-rate-limiter' into 'develop'
...
New rate limiter
See merge request pleroma/pleroma!1946
5 years ago
94627baa5c
New rate limiter
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
1649d6f689
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
5 years ago
31343e4321
Code style fixes
5 years ago
b2e8371e6a
Apply suggestion to CHANGELOG.md
5 years ago
6a4201e0b4
fix for migrate task
5 years ago
7438c177d9
Merge branch 'disable-attachment-links' into 'develop'
...
Disable attachment links by default
Closes #1394
See merge request pleroma/pleroma!1962
5 years ago
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
5 years ago
e08bd99bab
Apply suggestion to config/config.exs
5 years ago
4885d403fe
Apply suggestion to config/config.exs
5 years ago
Maxim Filippov