aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-25Apply suggestion to test/tasks/instance_test.exsMaksim
2019-09-25Merge branch 'emoji-packs-create-dir' into 'develop'rinpatch
When listing emoji packs, be sure to create the directory + add an endpoint to list remote packs since JS can't do that See merge request pleroma/pleroma!1711
2019-09-25Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.exrinpatch
2019-09-25Credo considered harmfulrinpatch
2019-09-25Remove useless with clauserinpatch
2019-09-25Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-25Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-25Fix emoji tags for shareable packs to be "pack:{name}"Ekaterina Vaartis
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-25Credo fix (remove parens on function definition)vaartis
2019-09-25Move emoji_dir_path & cache_seconds_per_file vaartis
2019-09-25When listing emoji packs, be sure to create the directoryEkaterina Vaartis
2019-09-25clears `robot.txt` after testsMaksim Pechnikov
2019-09-25Merge branch 'issue/1218' into 'develop'lain
[#1218] Issue/1218 See merge request pleroma/pleroma!1609
2019-09-25Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-09-25Merge branch 'develop' into issue/1218Maksim Pechnikov
2019-09-25Allow activities pagination via limit/offsetMaxim Filippov
2019-09-24/api/ap/uploadMedia → /api/ap/upload_mediaHaelwenn (lanodan) Monnier
2019-09-24litepub-0.1.jsonld: Add uploadMediaHaelwenn (lanodan) Monnier
2019-09-24Fix Credo warningsEgor Kislitsyn
2019-09-24Cleanup Pleroma.UserEgor Kislitsyn
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-24Extract notification actions from `MastodonAPIController` into ↵Egor Kislitsyn
`NotificationController`
2019-09-24Do not return tuple when unneededEgor Kislitsyn
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'feature/force-password-reset' into 'develop'kaniini
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705
2019-09-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703
2019-09-23Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini
added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651
2019-09-23Merge branch 'clean-up-views' into 'develop'kaniini
Clean up views See merge request pleroma/pleroma!1709
2019-09-23Clean up viewsSteven Fuchs
2019-09-23Merge branch 'emoji-pack-json-pretty' into 'develop'kaniini
Also pretty print pack.json See merge request pleroma/pleroma!1710
2019-09-24Also pretty print pack.jsonEkaterina Vaartis
2019-09-23Merge branch 'develop' into 'develop'rinpatch
add tunable for stream uploads, as needed for jortage to work. See merge request pleroma/pleroma!1708
2019-09-23add tunable for stream uploads, as needed for jortage to work.Rachel Fae Fox
2019-09-23updated testsMaksim Pechnikov
2019-09-23Merge branch 'update-adminfe/2019-09-23' into 'develop'rinpatch
Update AdminFE bundle See merge request pleroma/pleroma!1707
2019-09-23Update AdminFE bundleHaelwenn (lanodan) Monnier
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-23Merge branch 'better-emoji-packs' into 'develop'rinpatch
Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551
2019-09-23Emoji API Controller: Follow phoenix directory structurerinpatch
2019-09-23Add support for AP C2S uploadMediaHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23Document and test /api/ap/whoamiHaelwenn (lanodan) Monnier
2019-09-22Better changelog wordingMaxim Filippov
2019-09-22FormatMaxim Filippov
2019-09-22Update CHANGELOGMaxim Filippov
2019-09-22I did not put these lines in CHANGELOGMaxim Filippov