lain
73dd5bdb7d
Merge branch 'release/2.1.0' into 'stable'
Release/2.1.0
See merge request pleroma/pleroma!2927
hace 3 años
lain
b141e35d64
Mix: Update version
hace 3 años
lain
4e022fc16c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
hace 3 años
Haelwenn
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
hace 3 años
lain
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
hace 3 años
lain
1c05819c9b
Merge branch '2081-deleted-user-chats' into 'develop'
ChatController: Don't die if the recipient is gone.
Closes #2081
See merge request pleroma/pleroma!2926
hace 3 años
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
hace 3 años
rinpatch
22050f9ec0
Merge branch 'update/admin-fe-20200826' into 'develop'
Update AdminFE build in preparation for 2.1.0 release
See merge request pleroma/pleroma!2925
hace 3 años
Mark Felder
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
hace 3 años
lain
5dba3a50fc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
hace 3 años
rinpatch
6f17aea066
Merge branch 'fix/fast_html-build-errors' into 'develop'
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
See merge request pleroma/pleroma!2922
hace 3 años
lain
5ffd20f3b5
Changelog: Add info about list fixes.
hace 3 años
lain
cfc99fe05c
TimelineController: Keys are atoms now.
Closes #2078
Closes #2070
hace 3 años
rinpatch
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
hace 3 años
rinpatch
6ef9db0557
Merge branch '2079-welcome-message-docs' into 'develop'
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
hace 3 años
lain
b76839e008
Cheatsheet: Remove misleading example
hace 3 años
lain
fc42446755
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
hace 3 años
lain
7975351550
Merge branch 'chore/release-template-merge-back-to-develop' into 'develop'
release MR template: add a note about merging stable changes back to develop
See merge request pleroma/pleroma!2920
hace 3 años
rinpatch
dcd06488e0
release MR template: add a note about merging stable changes back to
develop
hace 3 años
Haelwenn
fd04137e18
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
Add multiarch support to docker container, fixes pleroma/pleroma-docker-compose#2
Closes pleroma-docker-compose#2
See merge request pleroma/pleroma!2789
hace 3 años
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
hace 3 años
Haelwenn
976094cd7b
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
Webfinger: Handle bogus ids better.
Closes #2077
See merge request pleroma/pleroma!2919
hace 3 años
lain
112bec5225
Webfinger: Handle bogus ids better.
hace 3 años
lain
49a436ad3e
Mix: Make rc version explicit.
hace 3 años
lain
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
hace 3 años
lain
361aa22e28
Merge branch 'frontend-bundles-downloads' into 'develop'
frontend install mix tasks
See merge request pleroma/pleroma!2841
hace 3 años
lain
6d6e43fd09
Description: Update description.
hace 3 años
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
hace 3 años
lain
5722b0e2e5
Merge branch 'docs/update-clients' into 'develop'
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
See merge request pleroma/pleroma!2914
hace 3 años
Haelwenn (lanodan) Monnier
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
hace 3 años
feld
3d5940da3e
Merge branch 'feature/add-preload-to-description' into 'develop'
Add Pleroma.Web.Preload to description.exs
See merge request pleroma/pleroma!2913
hace 3 años
Angelina Filippova
6e5678b5af
Add Pleroma.Web.Preload to description.exs
hace 3 años
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
hace 3 años
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
hace 3 años
lain
02db6c596e
Merge branch 'feature/2071-actor-type' into 'develop'
Adding actor type in user show
Closes #2071
See merge request pleroma/pleroma!2910
hace 3 años
Alexander Strizhakov
1f8c32b773
adding actor type in user show
hace 3 años
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
hace 3 años
lain
5c2b6922e1
Merge branch 'features/validators-audio2' into 'develop'
Pipeline Ingestion: Audio (Part 2)
See merge request pleroma/pleroma!2903
hace 3 años
lain
c1277be041
AudioHandlingTest: Make mock explicit
hace 3 años
lain
9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
hace 3 años
lain
5054a6aa9a
Merge branch 'fix-arm64' into 'develop'
CI: Fix release builds once more.
See merge request pleroma/pleroma!2907
hace 3 años
lain
d833d2c1fd
CI: Fix release builds once more.
hace 3 años
lain
4681771af4
Merge branch 'email-tests' into 'develop'
Fix for sometimes failing email tests
See merge request pleroma/pleroma!2906
hace 3 años
Alexander Strizhakov
c68bcae362
fix for sometimes failing tests
hace 3 años
lain
1c6303f620
Merge branch 'mix-task-fixes' into 'develop'
Fixes for mix tasks
See merge request pleroma/pleroma!2905
hace 3 años
Alexander Strizhakov
4727030f59
fixes for mix tasks
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
hace 3 años
Alexander Strizhakov
13f6029b4b
additional changelog entry
hace 3 años
Alexander Strizhakov
fa23d5d3d3
changelog entry
hace 3 años
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
hace 3 años
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
hace 3 años