summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2020-03-27Misc refactoring / tweaks (`ThreadMute.exists?/2`).Ivan Tashkinov
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-25Further preloading (more endpoints), refactoring, tests.Ivan Tashkinov
2020-03-25Add a test for accounts/update_credentialsEgor Kislitsyn
2020-03-24Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-24Implemented preloading of relationships with parent activities' actors for ↵Ivan Tashkinov
statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-23Home timeline tests: Add failing test for relationshipslain
2020-03-23creating trusted app from adminFE & mix taskAlexander Strizhakov
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ↵Ivan Tashkinov
usage).
2020-03-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
clear-config-test-improvements # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20NotificationController: Fix test.lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-18Improved in-test config management functions.Ivan Tashkinov
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-13rate limiter: disable based on if remote ip was found, not on if the plug ↵rinpatch
was enabled The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620
2020-03-12Merge branch 'develop' into gunAlexander Strizhakov
2020-03-11Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
2020-03-11Add support for funkwhale Audio activityHaelwenn (lanodan) Monnier
reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-07Merge branch 'develop' into gunAlexander Strizhakov
2020-03-05removing try block in tesla requestAlexander Strizhakov
added mocks for tests which fail with Tesla.Mock.Error
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-03Update CopyrightsMark Felder
2020-03-02Merge branch 'develop' into fix/signup-without-emailEgor Kislitsyn
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-02-27Runtime configurability of RateLimiter. Refactoring. Disabled default rate ↵Ivan Tashkinov
limits in tests.
2020-02-27Do not fail when user has no emailEgor Kislitsyn
2020-02-26Allow account registration without an emailEgor Kislitsyn
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-20Merge branch 'tests-clear-config-tweaks' into 'develop'lain
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
tests-clear-config-tweaks # Conflicts: # test/web/admin_api/admin_api_controller_test.exs
2020-02-18Add a testEgor Kislitsyn
2020-02-17Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
2020-02-13Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵Ivan Tashkinov
config during test suite execution.
2020-02-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-12Fix `status.expires_in` validationEgor Kislitsyn
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-11Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1276Maksim Pechnikov