Commit Graph

8715 Commits (2e58fe08cd5035e66d34c87f70588f8a307d51ed)
 

Author SHA1 Message Date
rinpatch 80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
5 years ago
rinpatch 6cf1958b02 moderation log: fix improperly migrated data
5 years ago
Alexander Strizhakov 474ef512df wait in mix task while pleroma is rebooted
5 years ago
rinpatch f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
5 years ago
Mark Felder e25bacabb1 Remove EmojiPacks from AdminFE build
5 years ago
rinpatch a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
rinpatch 4271cfb81a Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch 7605fe5065 Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch 3508ae7039 version bump changelog and mix version
5 years ago
rinpatch 69a85e9c82 changelog: sync with stable
5 years ago
lain 47604907c9 Merge branch 'proper_error_messages' into 'develop'
5 years ago
lain f1750b4658 Admin API tests: Fix wrong test.
5 years ago
Haelwenn 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop'
5 years ago
Mark Felder ec3dc462ff Document the instance stats fix
5 years ago
Mark Felder cdb05633a6 Generate instance stats on startup
5 years ago
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Haelwenn 5992c256ad Merge branch 'chore/update-copyrights' into 'develop'
5 years ago
Mark Felder 5592db4757 Older copyright updates
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
lain 4c02e04935 Merge branch 'prepared-statements-settings' into 'develop'
5 years ago
eugenijm 7af431c150 Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
rinpatch 45b08ca166 Merge branch 'docs_cheatsheet_fix' into 'develop'
5 years ago
ilja 036e8a40a2 fix for :fetch_initial_posts
5 years ago
Haelwenn 764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
5 years ago
Haelwenn 6ceef768cb Merge branch 'chores/bump-copyright' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Haelwenn (lanodan) Monnier 6c0d869d9d
Bump copyright years of files changed after 2019-01-01
5 years ago
rinpatch 6471c09372 Merge branch 'docs_cheatsheet' into 'develop'
5 years ago
Ilja 53ef8c11b9 Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
5 years ago
Alexander Strizhakov 34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov ba87ed7335
fix for compiling
5 years ago
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
rinpatch 438394d404 Merge branch 'fix/easy-timeline-dos' into 'develop'
5 years ago
rinpatch b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
rinpatch e6ccf12129 changelog: entries for timeline DoS fixes
5 years ago
rinpatch ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
rinpatch 4d416343fa rate limiter: Fix a race condition
5 years ago
rinpatch df2173343a pagination: limit the number of elements returned at one time to 40
5 years ago
rinpatch 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
5 years ago
Ivan Tashkinov c747260989 [#2250] Tiny refactoring per merge request review.
5 years ago
rinpatch 269aa9c8a5 Merge branch 'chore/update-cachex' into 'develop'
5 years ago
rinpatch c026128325 deps: update cachex to 3.2.0
5 years ago
rinpatch 0fefc4033f Merge branch 'mastofe/bundle-2020-01-20' into 'develop'
5 years ago
Haelwenn 5db2fb3ce7 Merge branch 'descriptions-changes' into 'develop'
5 years ago
Alexander Strizhakov 04b03e4762
streamer group & Oban crontab child
5 years ago
Haelwenn (lanodan) Monnier 2a850abbeb
MastoFE: Bundle 2020-01-20
5 years ago
feld aad057a2d6 Merge branch 'update/pleroma-fe-20200228' into 'develop'
5 years ago
Mark Felder bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228
5 years ago