aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Expand)Author
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-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-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-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-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-07added docs to docs/api/admin_api.mdAlex S
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-06fix for field nameAlex S
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
2019-04-06admin api endpoints for invitesAlex S
2019-04-06token -> invite renamingAlex S
2019-04-06twitter api registrationAlex S
2019-04-06generating tokens with mixAlex S
2019-04-05Redirect to the referer url after mastofe authorizationSergey Suprunenko
2019-04-05Mock :crypt.crypt/2 because otherwise the test fails on Mac OSSergey Suprunenko
2019-04-05We actually want the user id not nickname in the test...Mark Felder
2019-04-05Also remove Repo functions in the testsMark Felder
2019-04-05Add user following / unfollowing to the admin api.Roger Braun
2019-04-05Mix format everythingSadposter
2019-04-05Don't use twitterAPI for subscription testsSadposter
2019-04-05Change relationship direction of subscriptionsSadposter
2019-04-05Add subscription key to one test I forgot aboutSadposter