summaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2020-03-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex
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-13Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272
2020-03-12Merge branch 'develop' into gunAlexander Strizhakov
2020-03-12Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-03-12Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs
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-11Merge branch 'relay-list-change' into 'develop'feld
Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240
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-11[#1560] Enforced authentication for non-federating instances in ↵Ivan Tashkinov
StaticFEController.
2020-03-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10tesla adapter can't be changed in adminFEAlexander Strizhakov
2020-03-09[#1560] Ensured authentication or enabled federation for federation-related ↵Ivan Tashkinov
routes. New tests + tests refactoring.
2020-03-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-07Merge branch 'develop' into gunAlexander Strizhakov
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-05[#1560] Misc. improvements in ActivityPubController federation state ↵Ivan Tashkinov
restrictions.
2020-03-05removing try block in tesla requestAlexander Strizhakov
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
2020-03-05Admin API tests: Fix wrong test.lain
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-04same copyright date formatAlexander Strizhakov
2020-03-03Merge branch 'develop' into gunMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-03[#1560] ActivityPubController federation state restrictions adjustments. ↵Ivan Tashkinov
Adjusted tests.
2020-03-03Merge branch 'develop' into gunAlexander Strizhakov
2020-03-03Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-03-02[#1560] Added tests for non-federating instance bahaviour to ↵Ivan Tashkinov
OStatusControllerTest.
2020-03-02[#1560] Added tests for non-federating instance bahaviour to ↵Ivan Tashkinov
ActivityPubControllerTest.
2020-03-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-02Merge branch 'develop' into fix/signup-without-emailEgor Kislitsyn
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
2020-03-02relay list shows hosts without accepted followAlexander Strizhakov
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-03-02Bump copyright years of files changed after 2019-01-01Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2020-03-01Merge branch 'develop' into gunAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-29Merge branch 'rate-limiter-runtime-settings' into 'develop'rinpatch
RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250
2020-02-29Merge branch 'develop' into gunAlexander Strizhakov
2020-02-27Merge branch 'admin-status-list' into 'develop'feld
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`) Closes #1550 See merge request pleroma/pleroma!2192
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-26Admin API: Exclude boosts from `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
2020-02-26Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts ↵eugenijm
`godmode` and `local_only`)
2020-02-26Allow account registration without an emailEgor Kislitsyn
2020-02-25Add a test to ensure OAuth tokens are tied to Push subscriptionsEgor Kislitsyn
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov