lain
0ab03e8564
Merge branch 'fix/1991-tzdata-update' into 'develop'
...
user agent if Endpoint is not started yet
Closes #1991
See merge request pleroma/pleroma!2945
4 years ago
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
4 years ago
lain
581f382e71
ListController: DRY up stuff.
4 years ago
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
4 years ago
rinpatch
d6e979aebe
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
rinpatch
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
4 years ago
Alexander Strizhakov
a11f23c130
user agent if Endpoint is not started yet
4 years ago
rinpatch
19691389b9
Rich media: Add failure tracking
4 years ago
rinpatch
46236d1d87
html.ex: optimize external url extraction
...
By using a :not() selector and only extracting attributes from the
first match.
4 years ago
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
rinpatch
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
Alexander Strizhakov
84fbf16161
timeout option moved to gun adapter helper
4 years ago
Alexander Strizhakov
1c57ef4498
default pool for tz_data client
4 years ago
rinpatch
96de4bfbca
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
4 years ago
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
4 years ago
Alexander Strizhakov
5e8adf91b4
don't overwrite passed pool option in http clients
4 years ago
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
Karol Kosek
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
4 years ago
Sean King
0a9c63fb43
Fix frontend install mix task bug
4 years ago
Alexander Strizhakov
03d06062ab
don't fail on url fetch
4 years ago
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
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
Haelwenn (lanodan) Monnier
d9a21e4784
fetcher: Remove fix_object call for Question activities
4 years ago
Haelwenn (lanodan) Monnier
b960cede9a
common_fixes: Force inserting context and context_id
4 years ago
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
4 years ago
Haelwenn (lanodan) Monnier
2ecc7d9230
transmogrifier: Remove mastodon emoji-format from emoji field
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