aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-02Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch
fix for :fetch_initial_posts See merge request pleroma/pleroma!2266
2020-03-02fix for :fetch_initial_postsilja
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
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-02Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
Bump copyright See merge request pleroma/pleroma!2265
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 'docs_cheatsheet' into 'develop'rinpatch
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source See merge request pleroma/pleroma!2262
2020-03-01Add warning to the fetch_initial_posts setting. Now we sometimes have people ↵Ilja
who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users) I also made a more explicit distinction between OTP and from source installs in the general explanation
2020-03-01spec fixAlexander Strizhakov
2020-03-01fix for compilingAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-29Merge branch 'fix/easy-timeline-dos' into 'develop'rinpatch
Cap the number of requested statuses in timelines to 40 and rate limit them See merge request pleroma/pleroma!2253
2020-03-01timeline controller: add a TODO for replacing copypaste with a macrorinpatch
2020-03-01changelog: entries for timeline DoS fixesrinpatch
2020-03-01timeline controller: rate limit timelines to 3 requests per 500ms per ↵rinpatch
timeline per ip/user
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-03-01pagination: limit the number of elements returned at one time to 40rinpatch
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-29Merge branch 'chore/update-cachex' into 'develop'rinpatch
deps: update cachex to 3.2.0 See merge request pleroma/pleroma!2259
2020-02-29deps: update cachex to 3.2.0rinpatch
2020-02-29Merge branch 'mastofe/bundle-2020-01-20' into 'develop'rinpatch
MastoFE: Bundle 2020-01-20 See merge request pleroma/pleroma!2257
2020-02-29Merge branch 'descriptions-changes' into 'develop'Haelwenn
Adding streamer group & Oban crontab child to descriptions.exs Closes #1592 See merge request pleroma/pleroma!2258
2020-02-29streamer group & Oban crontab childAlexander Strizhakov
2020-02-29MastoFE: Bundle 2020-01-20Haelwenn (lanodan) Monnier
2020-02-28Merge branch 'update/pleroma-fe-20200228' into 'develop'feld
Update PleromaFE bundle for the 2.0 release See merge request pleroma/pleroma!2255
2020-02-28Merge branch 'develop' into update/pleroma-fe-20200228Mark Felder
2020-02-28Update PleromaFE bundle for the 2.0 releaseMark Felder
2020-02-28Merge branch 'update/admin-fe-20200228' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2254
2020-02-28Update AdminFE buildMark Felder
- Removed Grouped Reports; API needs proper architecture/refactor - Cannot set Tesla adapter in AdminFE as it's not safe yet - Layout/rendering improvements
2020-02-28Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.exIvan Tashkinov
2020-02-28Merge branch 'filtered-params' into 'develop'Haelwenn
add confirm field to filtered params See merge request pleroma/pleroma!2251
2020-02-28add confirm field to filtered paramsSteven Fuchs
2020-02-27Merge branch 'descriptions-changes' into 'develop'feld
Removing unnecessary groups from descriptions.exs See merge request pleroma/pleroma!2247
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-27Merge branch 'exclude-boosts-admin-api' into 'develop'feld
Admin API: filter out boosts from recent statuses Closes #1589 See merge request pleroma/pleroma!2248
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-26unnecessary groupsAlexander Strizhakov
2020-02-26Merge branch 'feat/instance-gen-improvements' into 'develop'lain
small instance.gen task improvements See merge request pleroma/pleroma!2245
2020-02-26instance.gen task: make example instance name less confusingrinpatch
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
2020-02-25instance.gen task: remind to transfer the config to the database afterrinpatch
migrations
2020-02-25instance.gen task: make instance name default to the domainrinpatch
2020-02-25Merge branch 'fix/dialyzer-warnings' into 'develop'rinpatch
Fix Dialyzer warnings See merge request pleroma/pleroma!2242
2020-02-25Merge branch 'merge/admin-fe-20200225' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2244
2020-02-25Update AdminFE buildMark Felder
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-25Fix Dialyzer warningsEgor Kislitsyn