fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
7577 commits 26 branches 107 tags 316 MiB
Commit graph

4648 commits

Author SHA1 Message Date
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 6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +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 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
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
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 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
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 31343e4321 Code style fixes 2019-11-11 19:06:09 +09:00
Alexander 6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
lain a88e834dba Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-11-10 11:32:50 +00:00
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop' 
[#1339] add subject to atom feed

See merge request pleroma/pleroma!1961
 2019-11-10 11:20:20 +00:00
Maksim Pechnikov 9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Phil Hagelberg 3cc49cdb78 Formatter moved to new module. 2019-11-09 18:30:23 -08:00
Phil Hagelberg ef7c3bdc7a Add some further test cases. 
Including like ... private visibility, cos that's super important.
 2019-11-09 18:08:45 -08:00
Phil Hagelberg 4729027f91 Prevent non-local notices from rendering. 2019-11-09 18:08:45 -08:00
Phil Hagelberg 886a07ba57 Move static_fe config to its own section instead of in :instance. 2019-11-09 18:08:45 -08:00
Phil Hagelberg b0080fa730 Render errors in HTML, not with JS. 2019-11-09 18:08:08 -08:00
Phil Hagelberg e27c61218d Expand subject content automatically when config is set. 2019-11-09 18:08:08 -08:00
Phil Hagelberg bfd5d79826 Include metadata in static FE conversations and profiles. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 828259fb65 Catch 404s. 2019-11-09 18:08:08 -08:00
Phil Hagelberg df2f59be91 Pagination for user profiles. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 8969c5522d Make many of the improvements suggested in review. 2019-11-09 18:08:08 -08:00
Phil Hagelberg e8bee35578 Static FE plug should only respond to text/html requests. 2019-11-09 18:08:08 -08:00
Phil Hagelberg dc3b87d153 Move static FE routing into its own plug. 
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
 2019-11-09 18:08:08 -08:00
Phil Hagelberg c6c706161e Make sure notice link is remote if the post is remote. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 274cc18e8a Visually separate header. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 2ac1ece652 Fix a bug where reblogs were displayed under the wrong user. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 5d7c44266b Change date formatting. 2019-11-09 18:08:08 -08:00
Phil Hagelberg 1dc785b74b Move static-fe CSS to a separate file. 2019-11-09 18:07:50 -08:00
Phil Hagelberg e4b9784c39 Show counts for replies, likes, and announces for selected notice. 
Using text instead of an icon, for now.
 2019-11-09 18:07:50 -08:00
Phil Hagelberg 93e9c0cedf Format dates using CommonAPI utils. 2019-11-09 18:07:50 -08:00
Phil Hagelberg 918e1353f6 Add header to profile/notice pages linking to pleroma-fe. 2019-11-09 18:07:50 -08:00
Phil Hagelberg 33a26b61c3 Remove activity/user representer; move logic to controller. 2019-11-09 18:07:50 -08:00
Phil Hagelberg 41fde63def Get rid of @data in views and use separate fields. 2019-11-09 18:07:50 -08:00
Phil Hagelberg e944a2213d Use gettext for sensitive media warning. 2019-11-09 18:07:50 -08:00
Phil Hagelberg 2d1897e8a7 Apply all suggested changes from reviewers. 2019-11-09 18:07:50 -08:00
Phil Hagelberg cc1b07132f Notices should show entire thread from context. 2019-11-09 18:07:08 -08:00
Phil Hagelberg 748d800acb Show images, video, and audio attachments to notices. 2019-11-09 18:07:08 -08:00
Phil Hagelberg 1d8950798c Fix activity_representer to work with User.get_or_fetch returning tuple. 2019-11-09 18:06:51 -08:00
Phil Hagelberg 0cf04e1088 Fix OStatus controller to know about StaticFEController. 
But only when it's configured to be on.
 2019-11-09 18:06:51 -08:00
Phil Hagelberg e79d8985ab Don't show 404 in static-fe controller unless it's actually not found. 2019-11-09 18:06:51 -08:00
Phil Hagelberg c1fc139986 Add permalinks to the static-fe notice rendering. 2019-11-09 18:06:51 -08:00
Phil Hagelberg d1320160f4 Looks like source_data is on user directly now. 2019-11-09 18:06:51 -08:00