kaniini
|
1417627d07
|
Merge branch 'remove-avatar-header' into 'develop'
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
|
5 years ago |
|
Haelwenn
|
95c085174d
|
Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
|
5 years ago |
|
rinpatch
|
376a55c97f
|
Merge branch '161-incoming-replies-depth-limit' into 'develop'
[#161] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
|
5 years ago |
|
lain
|
abe2e8881f
|
Testing: Don't federate in testing.
|
5 years ago |
|
rinpatch
|
72b88c82bc
|
Mastodon API: Fix embedded relationships not being rendered inside of statuses
|
5 years ago |
|
Ivan Tashkinov
|
ad8d86e7c6
|
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
|
5 years ago |
|
Eugenij
|
ab50c6b3ca
|
Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists
in the database.
|
5 years ago |
|
Ivan Tashkinov
|
a799418573
|
[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Ivan Tashkinov
|
2b9d914089
|
[#161] Refactoring, documentation.
|
5 years ago |
|
Eugenij
|
1f76740e10
|
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
|
5 years ago |
|
rinpatch
|
4c60a562a7
|
Fix not being able to pin unlisted posts
Closes #1038
|
5 years ago |
|
Ivan Tashkinov
|
5b7b1040b3
|
[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
|
5 years ago |
|
kaniini
|
d1549a6375
|
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
|
5 years ago |
|
William Pitcock
|
c22f0bfb80
|
test: add tests for mediaproxy warming policy
|
5 years ago |
|
Maxim Filippov
|
90927e6a9a
|
Kowalski, analysis!
|
5 years ago |
|
Maxim Filippov
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
5 years ago |
|
Sergey Suprunenko
|
d53fb55bb7
|
Return correct response when reply to a direct message is not direct itself
|
5 years ago |
|
Maksim Pechnikov
|
4ad15ad2a9
|
add ignore hosts and TLDs for rich_media
|
5 years ago |
|
Maksim Pechnikov
|
0cb8e710fb
|
add test
|
5 years ago |
|
Maksim
|
a0c4ebb4d7
|
[#184] small refactoring reset password
|
5 years ago |
|
Eugenij
|
f2c03425b0
|
Broadcast conversation update when DM is deleted
|
5 years ago |
|
kaniini
|
27b9605de0
|
Merge branch 'rich_media_titles_two' into 'develop'
Rich media titles two
See merge request pleroma/pleroma!1325
|
5 years ago |
|
Alex S
|
b37ede5df3
|
log capturing
|
5 years ago |
|
Alex S
|
982cad0268
|
support for config groups
|
5 years ago |
|
Sachin Joshi
|
a0c65bbd6c
|
Merge branch 'develop' into 'remove-avatar-header'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
5 years ago |
|
lain
|
0e415921cd
|
Rich Media Parser: Do not return just a title if nothing else is there.
|
5 years ago |
|
lain
|
58c4d5312b
|
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
This reverts commit b6af80f769.
|
5 years ago |
|
Alex S
|
f0fccb7578
|
fix for int and modules
|
5 years ago |
|
kaniini
|
55742d978d
|
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
implement anti link spam MRF
See merge request pleroma/pleroma!1307
|
5 years ago |
|
kaniini
|
e3534f5b3c
|
Merge branch 'oauth_secure_redirect' into 'develop'
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
|
5 years ago |
|
feld
|
b6af80f769
|
Revert "Merge branch 'fix/ogp-title' into 'develop'"
This reverts merge request !1277
|
5 years ago |
|
Alexander Strizhakov
|
32320c1ee9
|
Fixes for dynamic configuration
|
5 years ago |
|
William Pitcock
|
21dacd4b15
|
unbreak polls
|
5 years ago |
|
William Pitcock
|
736d8ad6be
|
implement anti link spam MRF
|
5 years ago |
|
Ivan Tashkinov
|
9f45f93949
|
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
|
5 years ago |
|
rinpatch
|
c7acca2abb
|
Mastodon API: Sanitize display names
Closes #1000
|
5 years ago |
|
rinpatch
|
49a49d3763
|
Merge branch 'removing-test-errors' into 'develop'
Removing test errors
See merge request pleroma/pleroma!1296
|
5 years ago |
|
Haelwenn
|
c34327b22e
|
Merge branch 'fix/sanitize-report-content' into 'develop'
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
|
5 years ago |
|
Alex S
|
2e2edcb461
|
capturing errors
|
5 years ago |
|
Maksim
|
a04bf131e0
|
[#570] add user:notification stream
|
5 years ago |
|
rinpatch
|
bf6aa6f1a8
|
Fix report content stopping to be nullable
|
5 years ago |
|
rinpatch
|
44de34d170
|
Credo fixes
|
5 years ago |
|
rinpatch
|
e943905bd7
|
Add tests for report view
|
5 years ago |
|
kaniini
|
52b1b0e45d
|
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
[#963] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
|
5 years ago |
|
lain
|
a440cf856d
|
Mastodon API: Return the token needed for the chat.
|
5 years ago |
|
rinpatch
|
62ffc00a5d
|
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
AccountView: Add user background.
See merge request pleroma/pleroma!1280
|
5 years ago |
|
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
5 years ago |
|
Maksim
|
ee4ed87fb4
|
[#948] /api/v1/account_search added optional parameters (limit, offset, following)
|
5 years ago |
|
lain
|
eac298083f
|
MastodonAPI: Add a way to update the background image.
|
5 years ago |
