Maksim Pechnikov
9da4c88b49
fix test
2019-11-18 10:00:48 +03:00
Maksim Pechnikov
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
2019-11-18 09:44: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
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
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
2019-11-15 14:13:21 +01:00
kPherox
72d2557e11
Add fieldsLimit to metadata of nodeinfo
2019-11-15 18:52:31 +09:00
Ariadne Conill
eecd64cc07
object age policy: remove debug logging
2019-11-14 19:56:14 -06:00
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
2019-11-14 19:48:10 -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
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
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
Mark Felder
7d101bc9c5
Fix rendering conversations when there's a malformed status
2019-11-11 18:29:55 -06:00
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
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
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
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
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
