rinpatch
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
2020-09-17 21:22:06 +03:00
rinpatch
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
2020-09-17 21:22:03 +03:00
rinpatch
a5d6c9aa8e
mix.exs: bump version to 2.1.2
2020-09-17 19:54:41 +03:00
rinpatch
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
2020-09-17 19:51:54 +03:00
rinpatch
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
2020-09-17 19:50:51 +03:00
Haelwenn
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
2020-09-17 19:50:23 +03:00
lain
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
2020-09-17 19:49:08 +03:00
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
rinpatch
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
2020-09-17 19:06:10 +03:00
rinpatch
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
2020-09-17 19:04:50 +03:00
rinpatch
425324aae3
Merge branch 'release/2.1.1' into 'stable'
...
2.1.1 release
See merge request pleroma/secteam/pleroma!13
2020-09-08 17:21:12 +00:00
Haelwenn
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
2020-09-08 19:46:23 +03:00
rinpatch
7528a7e447
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
2020-09-08 19:45:44 +03:00
rinpatch
27c3973b78
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
2020-09-08 19:45:44 +03:00
rinpatch
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
2020-09-08 19:45:44 +03:00
rinpatch
e430e98e7d
CHANGELOG.md: Add 2.1.1 entry
2020-09-08 19:45:44 +03:00
rinpatch
9c76769878
mix.exs: bump version to 2.1.1
2020-09-08 15:09:10 +03:00
rinpatch
ce3474f4d3
Disable favicon scraping in tests
2020-09-08 15:09:10 +03:00
rinpatch
4b76d7ce67
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
...
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
2020-09-08 14:00:00 +03:00
lain
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
2020-09-08 13:56:42 +03:00
lain
4306050da9
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
2020-09-08 13:56:29 +03:00
rinpatch
59f5e39f9b
Merge branch 'chore/fast_html-bump' into 'develop'
...
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
2020-09-08 13:56:09 +03:00
rinpatch
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
2020-09-08 13:55:52 +03:00
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
rinpatch
515116e2f0
Merge branch 'chore/fast-sanitize-bump' into 'develop'
...
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
2020-09-08 13:53:32 +03:00
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
74d46a1b09
Merge branch 'secfix/search-crash' into 'develop'
...
Fix crash done via search
See merge request pleroma/secteam/pleroma!12
2020-09-08 12:53:11 +03:00
rinpatch
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
lain
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
lain
b141e35d64
Mix: Update version
2020-08-28 11:34:48 +02:00
lain
4e022fc16c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-28 11:33:11 +02:00
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
2020-08-27 17:05:53 +00:00
lain
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-27 15:38:03 +02:00
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
2020-08-27 11:18:42 +00:00
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
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
2020-08-27 04:11:34 +00:00
Mark Felder
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
2020-08-26 15:43:34 -05:00
lain
5dba3a50fc
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-26 15:58:49 +02:00
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
2020-08-26 13:49:52 +00:00
lain
5ffd20f3b5
Changelog: Add info about list fixes.
2020-08-26 15:40:00 +02:00
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
rinpatch
6da17f88d6
fix fast_html build errors with gcc 10 by bumping fast_sanitize
...
Closes #2058
2020-08-26 16:31:02 +03:00
rinpatch
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
lain
b76839e008
Cheatsheet: Remove misleading example
2020-08-26 13:53:16 +02:00
lain
fc42446755
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-26 13:17:39 +02:00
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
2020-08-26 05:50:41 +00:00
