summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-03-13Merge branch 'bugfix/br-vs-newline' into 'develop'rinpatch
Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204
2020-03-13Merge branch 'revert/cache-control' into 'develop'rinpatch
Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290
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-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 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288
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-11Revert "Set better Cache-Control header for static content"rinpatch
On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613
2020-03-11merging release default config on app startAlexander Strizhakov
2020-03-10Fix enforcement of character limitsMark Felder
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-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
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-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-03-01rate limiter: Fix a race conditionrinpatch
When multiple requests are processed by rate limiter plug at the same time and the bucket is not yet initialized, both would try to initialize the bucket resulting in an internal server error.
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-29[#2250] Tiny refactoring per merge request review.Ivan Tashkinov
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-25Merge branch 'token-web-push-test' into 'develop'feld
Add a test to ensure OAuth tokens are tied to Push subscriptions Closes #1551 See merge request pleroma/pleroma!2241
2020-02-25Add a test to ensure OAuth tokens are tied to Push subscriptionsEgor Kislitsyn
2020-02-25compile fixAlexander Strizhakov
2020-02-24Merge branch 'fix/instance-gen-custom-static' into 'develop'rinpatch
instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237
2020-02-24instance.gen task: fix crash when using custom static directoryrinpatch
Closes #1082
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
2020-02-24Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'lain
Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236
2020-02-24Captcha: return invalid when answer_data is nilHaelwenn (lanodan) Monnier
2020-02-24captcha_test.exs: Use the same testing logic in Kocaptcha and nativeHaelwenn (lanodan) Monnier
2020-02-22Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226
2020-02-20Merge branch 'require-signature' into 'develop'lain
Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # config/config.exs
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
New users digest email Closes #1514 See merge request pleroma/pleroma!2128
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-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 09:05:23 +0000