summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-22Merge branch 'add-healthcheck-setting-to-config' into 'develop'kaniini
added healthcheck setting to instance config See merge request pleroma/pleroma!1088
2019-04-22Add :emoji settings to config.mdilja
2019-04-22added healthcheck setting to instance configAlex S
2019-04-22Add shortcode_globs setting to documentationilja
2019-04-22Add a changelog entry for `pleroma.in_reply_to_account_acct`rinpatch
2019-04-22Add `pleroma.in_reply_to_account_acct` to MastoAPI status entityrinpatch
2019-04-22Replace Object.normalize(activity.data[object] with ↵rinpatch
Object.normalize(acitivty) to benefit from preloading
2019-04-22Merge branch 'fix/emoji-task-docs' into 'develop'rinpatch
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs See merge request pleroma/pleroma!1084
2019-04-22Fix unclosed ` and put synopsis into a code block in pleroma.emoji mixrinpatch
task docs
2019-04-22Merge branch 'get-cached-everywhere' into 'develop'kaniini
Use `User.get_cached*` everywhere See merge request pleroma/pleroma!1021
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Merge branch 'feature/826-healthcheck-endpoint' into 'develop'kaniini
Feature/826 healthcheck endpoint Closes #826 See merge request pleroma/pleroma!1083
2019-04-22Feature/826 healthcheck endpointAlexander Strizhakov
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-22Merge branch 'rework-emoji-management' into 'develop'kaniini
Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073
2019-04-21Fix emoji.txt / custom_emoji.txt / shortcode_globs handlingEkaterina Vaartis
2019-04-21Merge branch 'docs/posting_formatted' into 'develop'rinpatch
differences_in_mastoapi_responses.md: `content_type` parameter of post submission See merge request pleroma/pleroma!1081
2019-04-21FormattingEkaterina Vaartis
2019-04-21Change the default manifest to pleroma's namespaceEkaterina Vaartis
2019-04-21Replace MD5 with SHA256 for emoji pack verificationEkaterina Vaartis
2019-04-21Wrap the docstrings to 70 charactersEkaterina Vaartis
2019-04-21Fix Credo warningRoman Chvanikov
2019-04-21Fix Credo warningRoman Chvanikov
2019-04-21Refactor conversation function in MastodonAPIController to use a ViewRoman Chvanikov
2019-04-21Merge branch '923_oauth_controller_refactoring_p2' into 'develop'lambda
[#923] Refactored OAuthController#authorize See merge request pleroma/pleroma!1080
2019-04-21Add accounts and last_status to conversation read responseRoman Chvanikov
2019-04-21Move comments for email_notifications config to docsRoman Chvanikov
2019-04-21differences_in_mastoapi_responses.md: `content_type` parameter of post ↵Haelwenn (lanodan) Monnier
submission
2019-04-21Remove debug codeRoman Chvanikov
2019-04-21Set digest emails to false by defaultRoman Chvanikov
2019-04-21[#923] Refactored OAuthController#authorize definitions, added test.Ivan Tashkinov
2019-04-21Merge branch 'fix/mastoapi-status-view' into 'develop'kaniini
MastoAPI reblog status view See merge request pleroma/pleroma!1065
2019-04-21Set correct values in the MastoAPI reblog status vieweugenijm
2019-04-21Merge branch 'fix/follow-with-reblogs' into 'develop'kaniini
Handle `reblogs` on the first follow request See merge request pleroma/pleroma!1076
2019-04-21Merge branch 'patch-1' into 'develop'kaniini
Mention Mastodon 2.8+ follow import fix in changelog See merge request pleroma/pleroma!1079
2019-04-20Mention Mastodon 2.8+ follow import fix in changelogFrancis Dinh
2019-04-21Refactor query to return only 1 message instead of 20Roman Chvanikov
2019-04-20Fix Credo warningsRoman Chvanikov
2019-04-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Roman Chvanikov
feature/digest-email
2019-04-20Do not track coverage filesRoman Chvanikov
2019-04-20Digest emailsRoman Chvanikov
2019-04-20Remove most finmoji mentions where appropriateEkaterina Vaartis
2019-04-20Add the emoji packs & finmoji removal to the changelogEkaterina Vaartis
2019-04-20Fix priv/static/instance/static to be just instance/staticEkaterina Vaartis
It was a misunderstanding
2019-04-20Document the pleroma.emoji taskEkaterina Vaartis
2019-04-20Add a newline at the end of pack in ls-packsEkaterina Vaartis
2019-04-20Fix tests that used finmojiEkaterina Vaartis
2019-04-20Fix incorrect multiple emoji tag handling introduced in initial implEkaterina Vaartis
2019-04-20Make emoji default_manifest a config optionEkaterina Vaartis
2019-04-20Treat the manifest path as a file if it doesn't start with httpEkaterina Vaartis
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 05:24:53 +0000