summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-12Revert "simplify mentions escape"Egor
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
2019-04-12Merge branch 'fix/732-password-align' into 'develop'lambda
2019-04-12Merge branch 'ssl_trusted_cert' into 'develop'lambda
2019-04-12Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'kaniini
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-nul...kaniini
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini
2019-04-12Add `with_body: true` to requests relying on `max_body: val`Roman Chvanikov
2019-04-11Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'lambda
2019-04-11Update Mastodon Frontend to 2019-04-11 bundleHaelwenn (lanodan) Monnier
2019-04-10[#923] OAuth consumer params handling refactoring.Ivan Tashkinov
2019-04-10Merge branch 'develop' into feature/788-separate-email-addressesAlex S
2019-04-10adding notify_email setting for trigger emailsAlex S
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
2019-04-10Merge branch 'feature/user-status-subscriptions' into 'develop'lambda
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
2019-04-10transmogrifier.ex: Add fix_summary/1Haelwenn (lanodan) Monnier
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes s...rinpatch
2019-04-09Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
2019-04-09update the follower count when a follower is blockedSachin Joshi
2019-04-08Used cached user resources in subscriptionsSadposter
2019-04-08removing not needed invite updateAlex S
2019-04-08fix for elixir 1.7.4Alex S
2019-04-08Use Pleroma.Config instead of Application.get_envSadposter
2019-04-08Merge branch 'use-jobs-in-webpush' into 'develop'lambda
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Sever subscription in case of blockSadposter
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
2019-04-08Merge branch 'feature/697-language-tag-metadata' into 'develop'lambda
2019-04-08adding language tagAlexander Strizhakov
2019-04-08test for valid_invite?Alex S
2019-04-08Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08AdminApiControllerTest unused variables fix.Ivan Tashkinov
2019-04-08Merge branch 'develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
2019-04-08Merge branch 'scheduled-activities' into 'develop'lambda
2019-04-08renaming expire_at -> expires_atAlex S
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 00:09:26 +0000