aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-09-22Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-22Update docsMaxim Filippov
2019-09-22Use router helper to generate reset password linkMaxim Filippov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-20Mastodon API: Fix private and direct statuses not being filtered out from ↵eugenijm
the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-09-20Merge branch 'config/update-mongoose' into 'develop'Haelwenn
Make it obvious how to support dual stack for MongooseIM See merge request pleroma/pleroma!1702
2019-09-20Make it obvious how to support dual stack for MongooseIMfeld
2019-09-19Merge branch 'conversation-docs' into 'develop'rinpatch
API Docs: Document conversation ids. See merge request pleroma/pleroma!1701
2019-09-19Merge branch 'update/admin-fe-stable' into 'maint/1.1'kaniini
Update AdminFE for 1.1 branch See merge request pleroma/pleroma!1693
2019-09-19API Docs: Document conversation ids.lain
2019-09-19Merge branch 'docs/clients-update' into 'develop'Haelwenn
docs/clients.md: Update source code urls See merge request pleroma/pleroma!1697
2019-09-19Merge branch 'outbox_pagination' into 'develop'lain
Fix AP outbox pagination See merge request pleroma/pleroma!1700
2019-09-19Add test for correct AP outbox paginationD Anzorge
2019-09-19Merge branch 'direct_conversation_id_on_status_creation' into 'develop'rinpatch
Return `pleroma.direct_conversation_id` when creating a direct message See merge request pleroma/pleroma!1699
2019-09-19Fix pagination in AP outbox.jsonD Anzorge
2019-09-19moving to separate dirAlex S
2019-09-19generating remote activitiesAlex S
2019-09-19[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19Update CHANGELOGEgor Kislitsyn
2019-09-19 Add `rel="ugc"` to hashtags and mentionsEgor Kislitsyn
2019-09-19Update "config/description.exs"Egor Kislitsyn
2019-09-19Add support for `rel="ugc"`Egor Kislitsyn
2019-09-19Mastodon API: Return `pleroma.direct_conversation_id` when creating direct ↵eugenijm
messages (`POST /api/v1/statuses`)
2019-09-19Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-18Merge branch 'issue/733' into 'develop'Haelwenn
[#733] added test for Ostatus See merge request pleroma/pleroma!1657
2019-09-18Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698
2019-09-19Add :shared_pack_cache_seconds_per_file to description.exsEkaterina Vaartis
2019-09-18Bump copyright years of files changed in 2019Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18docs/clients.md: Update source code urlsHaelwenn (lanodan) Monnier
2019-09-19Get the nodeinfo address from the well-knownEkaterina Vaartis
2019-09-19Change path from nodeinfo to metadata->featuresEkaterina Vaartis
2019-09-19Document emoji pack listing in the api docsEkaterina Vaartis
2019-09-19Apply suggestion to docs/api/pleroma_api.mdvaartis
2019-09-19Apply suggestion to docs/api/pleroma_api.mdvaartis
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-13 21:52:42 +0000