aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-02Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch
2020-03-02fix for :fetch_initial_postsilja
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
2020-03-02Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
2020-03-02Bump copyright years of files changed after 2019-01-01Haelwenn (lanodan) Monnier
2020-03-01Merge branch 'docs_cheatsheet' into 'develop'rinpatch
2020-03-01Add warning to the fetch_initial_posts setting. Now we sometimes have people ...Ilja
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
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 timelin...rinpatch
2020-03-01rate limiter: Fix a race conditionrinpatch
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
2020-02-29[#2250] Tiny refactoring per merge request review.Ivan Tashkinov
2020-02-29Merge branch 'chore/update-cachex' into 'develop'rinpatch
2020-02-29deps: update cachex to 3.2.0rinpatch
2020-02-29Merge branch 'mastofe/bundle-2020-01-20' into 'develop'rinpatch
2020-02-29Merge branch 'descriptions-changes' into 'develop'Haelwenn
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
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
2020-02-28Update AdminFE buildMark Felder
2020-02-28Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.exIvan Tashkinov
2020-02-28Merge branch 'filtered-params' into 'develop'Haelwenn
2020-02-28add confirm field to filtered paramsSteven Fuchs
2020-02-27Merge branch 'descriptions-changes' into 'develop'feld
2020-02-27Merge branch 'admin-status-list' into 'develop'feld
2020-02-27Merge branch 'exclude-boosts-admin-api' into 'develop'feld
2020-02-27Runtime configurability of RateLimiter. Refactoring. Disabled default rate li...Ivan Tashkinov
2020-02-27Do not fail when user has no emailEgor Kislitsyn
2020-02-26Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/status...eugenijm
2020-02-26Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `go...eugenijm
2020-02-26unnecessary groupsAlexander Strizhakov
2020-02-26Merge branch 'feat/instance-gen-improvements' into 'develop'lain
2020-02-26instance.gen task: make example instance name less confusingrinpatch
2020-02-25instance.gen task: remind to transfer the config to the database afterrinpatch
2020-02-25instance.gen task: make instance name default to the domainrinpatch
2020-02-25Merge branch 'fix/dialyzer-warnings' into 'develop'rinpatch
2020-02-25Merge branch 'merge/admin-fe-20200225' into 'develop'feld
2020-02-25Update AdminFE buildMark Felder
2020-02-25Merge branch 'token-web-push-test' into 'develop'feld
2020-02-25Fix Dialyzer warningsEgor Kislitsyn