aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Expand)Author
2019-04-17Update functions in object fetcher for tesla and set up a proper mock for testsrinpatch
2019-04-17Added some more normalization calls all in mastodon api controllerrinpatch
2019-04-17Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
2019-04-16Handle new-style mastodon follow listsNormandy
2019-04-16activitypub: allow indirect messages from users being followed at a personal ...William Pitcock
2019-04-15Conversation: Add accounts to output.lain
2019-04-15Conversation: Return full status object, id is a string.lain
2019-04-15Merge branch 'fix/status-reblogged' into 'develop'lambda
2019-04-15Merge branch 'unfollow-oneself' into 'develop'lambda
2019-04-15Use User.get_cached_by*eugenijm
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-15Handle follow/unfollow directed to themselveseugenijm
2019-04-14Assign reblogged in the Mastodon reblog status vieweugenijm
2019-04-13naming fixAlex S
2019-04-13Merge develop to 788-separate-email-addressesAlex S
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
2019-04-12more testsEgor Kislitsyn
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11ActivityPub: Fix specs.lain
2019-04-10[#923] OAuth consumer params handling refactoring.Ivan Tashkinov
2019-04-10Conversations: Make tests run.lain
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 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10Conversations: Fix specs.lain
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes s...rinpatch
2019-04-08removing not needed invite updateAlex S
2019-04-08Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-co...lain
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
2019-04-08adding language tagAlexander Strizhakov
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-07added docs to docs/api/admin_api.mdAlex S
2019-04-06Merge branch 'fix/deactivated-user-error' into 'develop'feld