summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-08Merge branch 'develop' into issue/1469issue/1469Maksim Pechnikov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
2020-03-06Merge branch 'revert-67cc4dce' into 'develop'feld
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-02Merge branch 'prepared-statements-settings' into 'develop'lain
2020-03-02Exclude reblogs from `GET /api/pleroma/admin/statuses` by defaulteugenijm
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-01wait in mix task while pleroma is rebootedAlexander Strizhakov
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
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-18 23:21:30 +0000