Commit Graph

11545 Commits (7c055af567e08be7f171a2fb687926bef5920899)
 

Author SHA1 Message Date
lain b141e35d64 Mix: Update version
4 years ago
lain 4e022fc16c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
Haelwenn 6b01a09a08 Merge branch '2078-list-fixes' into 'develop'
4 years ago
lain 82bf27172c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain 1c05819c9b Merge branch '2081-deleted-user-chats' into 'develop'
4 years ago
lain 78939c1d16 ChatController: Don't die if the recipient is gone.
4 years ago
rinpatch 22050f9ec0 Merge branch 'update/admin-fe-20200826' into 'develop'
4 years ago
Mark Felder f1b9e3595d Update AdminFE build in preparation for 2.1.0 release
4 years ago
lain 5dba3a50fc Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
rinpatch 6f17aea066 Merge branch 'fix/fast_html-build-errors' into 'develop'
4 years ago
lain 5ffd20f3b5 Changelog: Add info about list fixes.
4 years ago
lain cfc99fe05c TimelineController: Keys are atoms now.
4 years ago
rinpatch 6da17f88d6 fix fast_html build errors with gcc 10 by bumping fast_sanitize
4 years ago
rinpatch 6ef9db0557 Merge branch '2079-welcome-message-docs' into 'develop'
4 years ago
lain b76839e008 Cheatsheet: Remove misleading example
4 years ago
lain fc42446755 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain 7975351550 Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
4 years ago
rinpatch dcd06488e0 release MR template: add a note about merging stable changes back to
4 years ago
Haelwenn fd04137e18 Merge branch 'buildx-multiarch-arm32v7' into 'develop'
4 years ago
feld fb33321fa2 Merge branch 'feature/1952-read-muted-notifications' into 'develop'
4 years ago
Haelwenn 976094cd7b Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
4 years ago
lain 112bec5225 Webfinger: Handle bogus ids better.
4 years ago
lain 49a436ad3e Mix: Make rc version explicit.
4 years ago
lain ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain 361aa22e28 Merge branch 'frontend-bundles-downloads' into 'develop'
4 years ago
lain 6d6e43fd09 Description: Update description.
4 years ago
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 5722b0e2e5 Merge branch 'docs/update-clients' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
4 years ago
feld 3d5940da3e Merge branch 'feature/add-preload-to-description' into 'develop'
4 years ago
Angelina Filippova 6e5678b5af Add Pleroma.Web.Preload to description.exs
4 years ago
feld d39abd02ac Merge branch 'relay-fix-admin-fe' into 'develop'
4 years ago
lain e1c8c599ff Merge branch 'features/validators-event' into 'develop'
4 years ago
lain 02db6c596e Merge branch 'feature/2071-actor-type' into 'develop'
4 years ago
Alexander Strizhakov 1f8c32b773
adding actor type in user show
4 years ago
Haelwenn (lanodan) Monnier 36c125a071
Pipeline Ingestion: Event
4 years ago
lain 5c2b6922e1 Merge branch 'features/validators-audio2' into 'develop'
4 years ago
lain c1277be041 AudioHandlingTest: Make mock explicit
4 years ago
lain 9aae342e7a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
4 years ago
lain 5054a6aa9a Merge branch 'fix-arm64' into 'develop'
4 years ago
lain d833d2c1fd CI: Fix release builds once more.
4 years ago
lain 4681771af4 Merge branch 'email-tests' into 'develop'
4 years ago
Alexander Strizhakov c68bcae362
fix for sometimes failing tests
4 years ago
lain 1c6303f620 Merge branch 'mix-task-fixes' into 'develop'
4 years ago
Alexander Strizhakov 4727030f59
fixes for mix tasks
4 years ago
Alexander Strizhakov 13f6029b4b
additional changelog entry
4 years ago
Alexander Strizhakov fa23d5d3d3
changelog entry
4 years ago
Alexander Strizhakov 7dc275b69b
relay fix for admin-fe
4 years ago
Haelwenn (lanodan) Monnier 5316e231b0
Pipeline Ingestion: Audio (Part 2)
4 years ago
Haelwenn 3d5d8c05c9 Merge branch '2064-image-blanking' into 'develop'
4 years ago