a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
7,747 Commits 3 Branches 0 Tags 244 MiB
Commit Graph

7747 Commits

Author SHA1 Message Date
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
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation. 
Introduced UserBlock.
 2019-11-10 16:30:21 +03: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
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
lain e08bd99bab Apply suggestion to config/config.exs 2019-11-10 11:02:34 +00:00
lain 4885d403fe Apply suggestion to config/config.exs 2019-11-10 10:44:23 +00:00
lain 8b8d705ce6 Merge branch 'refactor/readme' into 'develop' 
Partial readme rewrite

See merge request pleroma/pleroma!1958
 2019-11-10 10:30:52 +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 6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize. 2019-11-09 18:09:29 -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 2bf592f5dc Add tests for static_fe controller. 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
William Pitcock ca5ef201ef static fe: add remote follow button 2019-11-09 18:06:51 -08:00
William Pitcock b33fbd58e3 static fe: add support for message subjects 2019-11-09 18:06:51 -08:00
William Pitcock e2904b5777 static fe: reformat activity representer 2019-11-09 18:06:51 -08:00
William Pitcock 2b5bd5236d static fe: add user profile rendering 2019-11-09 18:06:51 -08:00
William Pitcock 8f08da750a static fe: use a generic activity representer to render activities 2019-11-09 18:06:51 -08:00