aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-02-25Add a test to ensure OAuth tokens are tied to Push subscriptionsEgor Kislitsyn
2020-02-25Merge branch 'test-fix' into 'develop'lain
Compile fix in tests See merge request pleroma/pleroma!2239
2020-02-25compile fixAlexander Strizhakov
2020-02-25Document database default changeslain
2020-02-25Add :unnamed option to default database configurationlain
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-24Merge branch 'status-visibility-count-stats' into 'develop'Haelwenn
Status count by visibility scope (`GET /api/pleroma/admin/stats` ) See merge request pleroma/pleroma!2097
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
2020-02-24Merge branch 'theming_your_instance' into 'develop'lain
DOCS Theming your instance See merge request pleroma/pleroma!2232
2020-02-24DOCS Theming your instanceIlja
I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance
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