aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-09Remove activity/user representer; move logic to controller.Phil Hagelberg
2019-11-09Get rid of @data in views and use separate fields.Phil Hagelberg
2019-11-09Use gettext for sensitive media warning.Phil Hagelberg
2019-11-09Apply all suggested changes from reviewers.Phil Hagelberg
2019-11-09Notices should show entire thread from context.Phil Hagelberg
2019-11-09Show images, video, and audio attachments to notices.Phil Hagelberg
2019-11-09Fix activity_representer to work with User.get_or_fetch returning tuple.Phil Hagelberg
2019-11-09Fix OStatus controller to know about StaticFEController.Phil Hagelberg
But only when it's configured to be on.
2019-11-09Don't show 404 in static-fe controller unless it's actually not found.Phil Hagelberg
2019-11-09Add permalinks to the static-fe notice rendering.Phil Hagelberg
2019-11-09Looks like source_data is on user directly now.Phil Hagelberg
2019-11-09static fe: add remote follow buttonWilliam Pitcock
2019-11-09static fe: add support for message subjectsWilliam Pitcock
2019-11-09static fe: reformat activity representerWilliam Pitcock
2019-11-09static fe: add user profile renderingWilliam Pitcock
2019-11-09static fe: use a generic activity representer to render activitiesWilliam Pitcock
2019-11-09static fe: formattingWilliam Pitcock
2019-11-09static fe: proof of conceptWilliam Pitcock
2019-11-10Merge branch 'refactor/cheatsheet' into 'develop'kaniini
Big config cheatsheet revamp See merge request pleroma/pleroma!1959
2019-11-10Big config cheatsheet revamprinpatch
Categorize things, remove old deprecation warnings, consistently place dots in unordered lists, fix links, etc.
2019-11-10readme: replace banner logo with the one using paths for textrinpatch
2019-11-10readme: Add logo bannerrinpatch
2019-11-09readme: remove unnecessary headingrinpatch
2019-11-09readme: Remove unnecessary description and add a missing dotrinpatch
2019-11-09Add #pleroma-dev to matrix section as wellrinpatch
2019-11-09Partial readme rewriterinpatch
Remove the outdated generic installation guide and point to platform-specific ones instead, update contact info, protocols we support, etc.
2019-11-08Merge branch 'chore/update-fe' into 'develop'rinpatch
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 See merge request pleroma/pleroma!1956
2019-11-09Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642rinpatch
2019-11-08Merge branch 'bugfix/containment-no-id' into 'develop'rinpatch
object containment: handle all cases where ID is invalid (missing, nil, non-string) Closes #1387 See merge request pleroma/pleroma!1955
2019-11-08object containment: handle all cases where ID is invalid (missing, nil, ↵Ariadne Conill
non-string)
2019-11-08Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'rinpatch
Bump fast_sanitize See merge request pleroma/pleroma!1953
2019-11-08Bump fast_sanitizerinpatch
Fixes build fails on freebsd
2019-11-08Merge branch 'chore/add-multifetch' into 'develop'kaniini
nodeinfo: add multifetch feature (ref pleroma-fe!977). See merge request pleroma/pleroma!1952
2019-11-08nodeinfo: add multifetch feature (ref pleroma-fe!977).Ariadne Conill
2019-11-08Merge branch 'chore/bump-fast-sanitize-again' into 'develop'rinpatch
Bump fast_sanitize to 0.1.2 See merge request pleroma/pleroma!1951
2019-11-08Bump fast_sanitize to 0.1.2rinpatch
Fixes build issues on macOS
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-08Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-08Support old flag formatMaxim Filippov
2019-11-07Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch
Bump fast_sanitize to 0.1.1 Closes #1378 See merge request pleroma/pleroma!1949
2019-11-08Bump fast_sanitize to 0.1.1rinpatch
The parser C-Node has been completely rewritten to not use the deprecated `erl_interface` api. Closes #1378 since Nodex was ripped out and the replacement randomizes master node name.
2019-11-07Merge branch 'recipients-filter' into 'develop'kaniini
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` See merge request pleroma/pleroma!1948
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-06Merge branch 'fix/unwrapped-object-return' into 'develop'rinpatch
Fetcher: fix local check returning unwrapped object See merge request pleroma/pleroma!1947
2019-11-07Fetcher: fix local check returning unwrapped objectrinpatch
This resulted in error messages about failed refetches being logged.
2019-11-06Merge branch 'fix/trailing-format-plug-oauth' into 'develop'rinpatch
Fix TrailingFormatPlug not being active for /api/oauth_tokens Closes #1385 See merge request pleroma/pleroma!1944
2019-11-06Merge branch 'changelog-cleanup' into 'develop'rinpatch
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md See merge request pleroma/pleroma!1945
2019-11-06Merge branch 'fix/saner-static-cache-control' into 'develop'rinpatch
Set better Cache-Control header for static content Closes #1382 See merge request pleroma/pleroma!1943
2019-11-06Fix TrailingFormatPlug not being active for /api/oauth_tokensrinpatch
2019-11-06Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.Ivan Tashkinov