Alexander Strizhakov
c17d83cd73
improvements and fixes for http requests
...
- fix for gun worker termination in some circumstances
- pool for http clients (ex_aws, tzdata)
- default pool timeouts for gun
- gun retries on gun_down messages
- s3 upload timeout if streaming enabled
4 years ago
lain
d48755791d
Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'
...
User table: ensure bio is always a string
Closes #2067
See merge request pleroma/pleroma!2938
4 years ago
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
4 years ago
rinpatch
dc3a418c27
application.ex: disable warnings_as_errors at runtime
...
see changed files for rationale
4 years ago
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
4 years ago
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
4 years ago
lain
e0eb90f62a
Merge branch 'issue/2068' into 'develop'
...
[#2068 ] marks notifications as read after mute
Closes #2068
See merge request pleroma/pleroma!2930
4 years ago
lain
d91c4feebe
Notification: Small refactor.
4 years ago
rinpatch
0417b2f649
Merge branch 'chore/fast-sanitize-bump' into 'develop'
...
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
4 years ago
rinpatch
858e9a59ed
mix.lock: bump fast_sanitize
...
The update brings a better error message for when cmake isn't installed
4 years ago
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
4 years ago
lain
51844b1e42
Merge branch 'stable-sync/2.1.0' into 'develop'
...
Merge stable in develop and bump development version
Closes #1610 , #1621 , #1613 , #1375 , #1374 , #1614 , #1422 , #1595 , #1620 , #1364 , #1640 , #1643 , #1653 , #1624 , #764 , #1687 , #1698 , #1670 , #1677 , #1727 , #1559 , #1746 , #1313 , #1810 , #751 , and #866
See merge request pleroma/pleroma!2928
4 years ago
lain
b41c8cff18
Merge branch 'mention-sudo-pleroma-when-updating' into 'develop'
...
Add mention of sudo -Hu pleroma to update docs
See merge request pleroma/pleroma!2929
4 years ago
Shpuld Shpludson
35da3be9dd
Add mention of sudo -Hu pleroma to docs
4 years ago
rinpatch
ce387ce730
mix.exs: bump development version after 2.1.0 release
4 years ago
lain
73dd5bdb7d
Merge branch 'release/2.1.0' into 'stable'
...
Release/2.1.0
See merge request pleroma/pleroma!2927
4 years ago
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'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
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'
...
ChatController: Don't die if the recipient is gone.
Closes #2081
See merge request pleroma/pleroma!2926
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'
...
Update AdminFE build in preparation for 2.1.0 release
See merge request pleroma/pleroma!2925
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'
...
fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
See merge request pleroma/pleroma!2922
4 years ago
lain
5ffd20f3b5
Changelog: Add info about list fixes.
4 years ago
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
rinpatch
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
4 years ago
rinpatch
6ef9db0557
Merge branch '2079-welcome-message-docs' into 'develop'
...
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
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'
...
release MR template: add a note about merging stable changes back to develop
See merge request pleroma/pleroma!2920
4 years ago
rinpatch
dcd06488e0
release MR template: add a note about merging stable changes back to
...
develop
4 years ago
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
4 years ago
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
4 years ago
Haelwenn
976094cd7b
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
...
Webfinger: Handle bogus ids better.
Closes #2077
See merge request pleroma/pleroma!2919
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'
...
frontend install mix tasks
See merge request pleroma/pleroma!2841
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'
...
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
See merge request pleroma/pleroma!2914
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'
...
Add Pleroma.Web.Preload to description.exs
See merge request pleroma/pleroma!2913
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'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
4 years ago
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
4 years ago
lain
02db6c596e
Merge branch 'feature/2071-actor-type' into 'develop'
...
Adding actor type in user show
Closes #2071
See merge request pleroma/pleroma!2910
4 years ago