a0f5e8b27e
Merge branch 'release/2.1.2' into 'stable'
...
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
4 years ago
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
4 years ago
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
4 years ago
a5d6c9aa8e
mix.exs: bump version to 2.1.2
4 years ago
6bbd65fb09
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
4 years ago
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
4 years ago
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
4 years ago
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
4 years ago
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
4 years ago
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
4 years ago
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
4 years ago
425324aae3
Merge branch 'release/2.1.1' into 'stable'
...
2.1.1 release
See merge request pleroma/secteam/pleroma!13
4 years ago
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
4 years ago
7528a7e447
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
4 years ago
27c3973b78
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
4 years ago
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
4 years ago
e430e98e7d
CHANGELOG.md: Add 2.1.1 entry
4 years ago
9c76769878
mix.exs: bump version to 2.1.1
4 years ago
ce3474f4d3
Disable favicon scraping in tests
4 years ago
4b76d7ce67
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
...
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
4 years ago
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
4 years ago
4306050da9
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
4 years ago
59f5e39f9b
Merge branch 'chore/fast_html-bump' into 'develop'
...
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
4 years ago
964bc8e2e8
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
4 years ago
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago
515116e2f0
Merge branch 'chore/fast-sanitize-bump' into 'develop'
...
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
4 years ago
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
4 years ago
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
4 years ago
74d46a1b09
Merge branch 'secfix/search-crash' into 'develop'
...
Fix crash done via search
See merge request pleroma/secteam/pleroma!12
4 years ago
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
4 years ago
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
4 years ago
73dd5bdb7d
Merge branch 'release/2.1.0' into 'stable'
...
Release/2.1.0
See merge request pleroma/pleroma!2927
4 years ago
b141e35d64
Mix: Update version
4 years ago
4e022fc16c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
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
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
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
78939c1d16
ChatController: Don't die if the recipient is gone.
4 years ago
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
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
4 years ago
5dba3a50fc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
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
5ffd20f3b5
Changelog: Add info about list fixes.
4 years ago
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
4 years ago
6ef9db0557
Merge branch '2079-welcome-message-docs' into 'develop'
...
Cheatsheet: Remove misleading example
Closes #2079
See merge request pleroma/pleroma!2921
4 years ago
b76839e008
Cheatsheet: Remove misleading example
4 years ago
fc42446755
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
rinpatch