aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-15add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`Egor Kislitsyn
2019-04-12more testsEgor Kislitsyn
2019-04-12add testsEgor Kislitsyn
2019-04-11fix formatEgor Kislitsyn
2019-04-11move user disable into deactivationEgor Kislitsyn
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
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-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
2019-04-07Add check on activity visibility in sub notificationSadposter
2019-04-07credo fixAlex S
2019-04-07added docs to docs/api/admin_api.mdAlex S
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth setti...Ivan Tashkinov
2019-04-06Merge branch 'fix/deactivated-user-error' into 'develop'feld
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Handle `scheduled_at` on status creation.eugenijm
2019-04-06Add scheduled activitieseugenijm
2019-04-06Return 403 on oauth token exchange for a deactivated usereugenijm
2019-04-06Merge branch 'fix/failed-legacy-test' into 'develop'feld
2019-04-06little channgesAlex S
2019-04-06JSON need quotes!Sadposter