cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
d6e979aebe
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-02 13:46:11 +00:00
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
46236d1d87
html.ex: optimize external url extraction
...
By using a :not() selector and only extracting attributes from the
first match.
2020-09-02 12:45:20 +03:00
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
84fbf16161
timeout option moved to gun adapter helper
2020-09-02 10:50:51 +03:00
1c57ef4498
default pool for tz_data client
2020-09-02 10:33:43 +03:00
96de4bfbca
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-02 06:55:58 +00:00
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
5e8adf91b4
don't overwrite passed pool option in http clients
2020-09-02 09:04:23 +03:00
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
2020-09-02 09:04:23 +03:00
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>
2020-09-02 02:08:43 +02:00
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +03:00
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
2020-09-01 09:32:01 +00:00
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01 10:45:42 +03:00
dc3a418c27
application.ex: disable warnings_as_errors at runtime
...
see changed files for rationale
2020-09-01 09:08:54 +03:00
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
2020-08-31 20:55:05 +00:00
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.
2020-08-31 16:48:17 +02:00
e0eb90f62a
Merge branch 'issue/2068' into 'develop'
...
[#2068 ] marks notifications as read after mute
Closes #2068
See merge request pleroma/pleroma!2930
2020-08-31 09:21:02 +00:00
d91c4feebe
Notification: Small refactor.
2020-08-31 11:02:54 +02:00
0417b2f649
Merge branch 'chore/fast-sanitize-bump' into 'develop'
...
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
2020-08-31 07:22:35 +00:00
858e9a59ed
mix.lock: bump fast_sanitize
...
The update brings a better error message for when cmake isn't installed
2020-08-31 09:54:16 +03:00
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
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
2020-08-28 14:40:26 +00:00
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
2020-08-28 14:12:23 +00:00
35da3be9dd
Add mention of sudo -Hu pleroma to docs
2020-08-28 13:50:21 +00:00
ce387ce730
mix.exs: bump development version after 2.1.0 release
2020-08-28 16:15:57 +03:00
73dd5bdb7d
Merge branch 'release/2.1.0' into 'stable'
...
Release/2.1.0
See merge request pleroma/pleroma!2927
2020-08-28 12:17:19 +00:00
b141e35d64
Mix: Update version
2020-08-28 11:34:48 +02:00
4e022fc16c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-28 11:33:11 +02:00
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
2020-08-27 17:05:53 +00:00
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-27 15:38:03 +02:00
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
2020-08-27 11:18:42 +00:00
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
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
2020-08-27 04:11:34 +00:00
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
2020-08-26 15:43:34 -05:00
5dba3a50fc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-26 15:58:49 +02:00
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
2020-08-26 13:49:52 +00:00
5ffd20f3b5
Changelog: Add info about list fixes.
2020-08-26 15:40:00 +02:00
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
2020-08-26 16:31:02 +03:00
6ef9db0557
Merge branch '2079-welcome-message-docs' into 'develop'
...
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
2020-08-26 13:11:17 +00:00
b76839e008
Cheatsheet: Remove misleading example
2020-08-26 13:53:16 +02:00
fc42446755
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-26 13:17:39 +02:00
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
2020-08-26 05:50:41 +00:00
dcd06488e0
release MR template: add a note about merging stable changes back to
...
develop
2020-08-26 07:09:28 +03:00
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
2020-08-25 22:27:19 +00:00
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
2020-08-25 21:32:32 +00:00
Mark Felder
feld