summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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 '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-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-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-19Mastodon API: Return `pleroma.direct_conversation_id` when creating direct ↵eugenijm
messages (`POST /api/v1/statuses`)
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
2019-09-19Move emoji reloading to admin apiEkaterina Vaartis
2019-09-19Move emoji api to pleroma api dirEkaterina Vaartis
2019-09-19A feature for shareable emoji packs, use it in download_from & testsEkaterina Vaartis
2019-09-19Move EmojiAPIController from EmojiAPI to PleromaAPIEkaterina Vaartis
2019-09-19Add documentation for the emoji endpointsEkaterina Vaartis
2019-09-19Make the emoji controller api more RESTyEkaterina Vaartis
2019-09-19Change :sha to :checksumEkaterina Vaartis
2019-09-19Change emoji api responses to JSONEkaterina Vaartis
2019-09-19Move emoji pack list from /list to /Ekaterina Vaartis
2019-09-19Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.exvaartis
2019-09-19Use with w/ pack_info_resEkaterina Vaartis
2019-09-19Remove unused variableEkaterina Vaartis
2019-09-19Split list_packsvaartis
2019-09-19Apply suggestions to emoji_api_controller.exvaartis
2019-09-19Fixed a typo in create_archive_and_cachevaartis
2019-09-19Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.exvaartis
2019-09-19Fix credo warningsEkaterina Vaartis
2019-09-19Add documentation for the emoji api endpointsEkaterina Vaartis
2019-09-19Allow importing old (emoji.txt / plain) packs from the filesystemEkaterina Vaartis
2019-09-19Use && insted of "and" for checking shared-files for packsEkaterina Vaartis
share-files can be nil and "and" does not like that
2019-09-19Add a way to create emoji packs via an endpointEkaterina Vaartis
2019-09-19Remove unused yaml dependency from mix.lockvaartis