summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-07Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'rinpatch
MRF: anti followbot: gracefully handle nil display names See merge request pleroma/pleroma!909
2019-03-07Merge branch 'update/pleroma-fe-20190307' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!910
2019-03-07update pleroma frontendWilliam Pitcock
2019-03-07tests: add regression testWilliam Pitcock
2019-03-07MRF: anti followbot: gracefully handle accounts without a display nameWilliam Pitcock
2019-03-07Merge branch 'bugfix/delete-activity-audience' into 'develop'rinpatch
expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891
2019-03-07Adjust delete activity audience to match the deleted objectKaren Konou
2019-03-07Revert existing object checkKaren Konou
2019-03-07Merge branch 'preserve-link-headers' into 'develop'lambda
Preserves parameters in link headers Closes #716 See merge request pleroma/pleroma!908
2019-03-07Preserve parameters in link headers (Mastodon API)eugenijm
2019-03-06Merge branch 'chore/merge-search-into-list-users' into 'develop'kaniini
Merge search endpoint into /users See merge request pleroma/pleroma!898
2019-03-06Merge branch 'bugfix/connect-src-https' into 'develop'kaniini
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src See merge request pleroma/pleroma!900
2019-03-06Merge branch 'bugfix/rel-me_list' into 'develop'kaniini
Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901
2019-03-06Merge branch 'feature/647' into 'develop'kaniini
[#647] tests for web push See merge request pleroma/pleroma!904
2019-03-06[#647] tests for web pushMaksim
2019-03-06Merge branch 'features/masto_fe-config' into 'develop'kaniini
Add default config for masto_fe See merge request pleroma/pleroma!906
2019-03-06Keep heading shortMaxim Filippov
2019-03-06Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'Haelwenn
Properly escape reserved URI charachters in upload urls Closes #700 See merge request pleroma/pleroma!905
2019-03-06Add default config for masto_feHaelwenn (lanodan) Monnier
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
2019-03-05Add handling of objects not in databaseKaren Konou
2019-03-05Add tests for reserved char escaping in uploadrinpatch
2019-03-05Properly escape reserved URI charachters in upload urlsrinpatch
2019-03-05Merge branch 'add-admin-to-node-info' into 'develop'rinpatch
Include admins in nodeinfo Closes #689 See merge request pleroma/pleroma!899
2019-03-05Web.RelMe: Fix having other values in rel attrHaelwenn (lanodan) Monnier
One example of this is Github which puts a rel="nofollow me" on the profile link.
2019-03-05Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-srcHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
2019-03-05Merge branch 'bugfix/rich-media-uri-validation' into 'develop'Haelwenn
rich media: don't crawl bogus URIs See merge request pleroma/pleroma!864
2019-03-05Include admins in nodeinfoeugenijm
2019-03-05TypoMaxim Filippov
2019-03-04rich media: helpers: rework validate_page_url()William Pitcock
2019-03-04local -> only_localMaxim Filippov
2019-03-04Format & update docsMaxim Filippov
2019-03-04helpers: use AutoLinker to validate URIs as well as the other testsWilliam Pitcock
2019-03-04tests: add tests for rich media helper functionsWilliam Pitcock
2019-03-04rich media: don't crawl bogus URIsWilliam Pitcock
2019-03-04Merge branch 'feature/add-status-text-to-notifications' into 'develop'kaniini
Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897
2019-03-04Merge search endpoint into /usersMaxim Filippov
2019-03-04Remove unused codeMaxim Filippov
2019-03-04Add status text to notifications (mentions and reposts)Maxim Filippov
2019-03-04Merge branch 'fix/like-adressing' into 'develop'kaniini
Stop adresssing like activities to actor's follower collection on non-public posts See merge request pleroma/pleroma!896
2019-03-04Stop adresssing like activities to actor's follower collection on non-public ↵rinpatch
posts
2019-03-04Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-03-04Merge branch 'unify-follow' into 'develop'kaniini
Unify follow code with CommonAPI Closes #690 See merge request pleroma/pleroma!889
2019-03-04Merge branch 'dm-visibility-for-blocking-users' into 'develop'kaniini
Fix DM visibility for blocking users #698 Closes #698 See merge request pleroma/pleroma!890
2019-03-04allow users to disable their own accountEgor Kislitsyn
2019-03-04Set content types settings on mastofe endpoint.KokaKiwi
2019-03-04Fix supported TLS versions as TLS 1.3 support seems buggy.KokaKiwi
2019-03-04Merge branch 'bugfix/delete-activity-audience' of ↵Karen Konou
git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience
2019-03-04fix formatKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou
2019-03-04Expand "to" of delete activitiesKaren Konou