summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
2020-07-09Merge branch 'follow-pipeline' into 'develop'Haelwenn
Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734
2020-07-09Merge branch 'patch-2' into 'develop'Haelwenn
fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
2020-07-09Merge branch 'patch-1' into 'develop'lain
added link to changelog, removed repetition See merge request pleroma/pleroma!2736
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
#1920 fix activity deletion See merge request pleroma/pleroma!2721
2020-07-09[static-fe] limit according to- and within- existing rulesetDym Sohin
2020-07-09Merge branch 'issue/1880' into 'develop'lain
[#1880] fixed delete `Like` activity in remove user See merge request pleroma/pleroma!2725
2020-07-09Update static-fe.csslain
2020-07-09Merge branch 'patch-3' into 'develop'lain
missed `:` (colon) before mrf_steal_emoji See merge request pleroma/pleroma!2738
2020-07-09missed `:` (colon) before mrf_steal_emojiDym Sohin
2020-07-09fix wide2x emojis within nicknamesDym Sohin
2020-07-09fix testMaksim Pechnikov
2020-07-09added link to changelog, removed repetitionDym Sohin
2020-07-08ActivityPub: Remove `follow` and fix issues.lain
2020-07-08CommonAPI: Switch to pipeline for following.lain
2020-07-08Transmogrifier: Move following to the pipeline.lain
2020-07-08Notification: For follows, notify the followed.lain
2020-07-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
follow-pipeline
2020-07-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880lain
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08[#1895] credo fix.Ivan Tashkinov
2020-07-08AccountController: Fix muting / unmuting reblogs.lain
2020-07-08[#1895] Applied code review suggestion.Ivan Tashkinov
2020-07-08fixed delete `Like` activity in remove userMaksim Pechnikov
2020-07-08Add changelog and documentationHaelwenn (lanodan) Monnier
2020-07-08Add [:instances_favicons, :enabled] setting, defaults to falseHaelwenn (lanodan) Monnier
2020-07-08instance: Prevent loop of updatesHaelwenn (lanodan) Monnier
2020-07-08Use instances table instead of CachexHaelwenn (lanodan) Monnier
2020-07-08Move get_favicon to Pleroma.Instances, use /Haelwenn (lanodan) Monnier
2020-07-08Add support for remote faviconsHaelwenn (lanodan) Monnier
2020-07-08Merge branch '1918-avatar-background-header-reset-2' into 'develop'Haelwenn
Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729
2020-07-08Merge branch 'fix/twitter-rich-media-preview' into 'develop'Haelwenn
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. Closes #1923 See merge request pleroma/pleroma!2730
2020-07-07Merge branch 'remove-twitter-api' into 'develop'lain
Remove some TwitterAPI endpoints See merge request pleroma/pleroma!2327
2020-07-07[#1895] Documentation hints on private instances and ↵Ivan Tashkinov
instance/restrict_unauthenticated setting.
2020-07-07[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance ↵Ivan Tashkinov
setting.
2020-07-07Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.Mark Felder
2020-07-07Update frontendlain
2020-07-07Changelog: Add info about avatar removallain
2020-07-07AccountController: Remove unused `update_?` routes.lain
These were not documented and are also not used anymore.
2020-07-07Docs: Document resetting of imageslain
2020-07-07AccountController: Allow removal / reset of user images.lain
2020-07-07Merge branch 'develop' into 'develop'lain
added hyper:// to default protocols See merge request pleroma/pleroma!2727
2020-07-07Merge branch 'bugfix/peertube-videos' into 'develop'lain
Fix getting videos from peertube See merge request pleroma/pleroma!2728
2020-07-07Merge branch 'feature/1392-support-irreversible-filters' into 'develop'Haelwenn
Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186
2020-07-07Fix getting videos from peertubeHaelwenn (lanodan) Monnier
2020-07-07added hyper:// to default protocolsDYM
2020-07-07Merge branch 'description-limits' into 'develop'Haelwenn
Add limits to image descriptions See merge request pleroma/pleroma!2724
2020-07-07Merge branch '1507-static-fe-prioritize-json' into 'develop'Haelwenn
StaticFE: Prioritize json in requests. Closes #1507 See merge request pleroma/pleroma!2695