Alibek Omarov
|
9b93eef715
|
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
|
4 years ago |
|
Alibek Omarov
|
630eb0f939
|
ConversationViewTest: fix test #2
|
4 years ago |
|
Alibek Omarov
|
149589c842
|
ConversationViewTest: fix test
|
4 years ago |
|
Alibek Omarov
|
390a12d4c8
|
ConversationControllerTest: fix test
|
4 years ago |
|
Alibek Omarov
|
241bd061fc
|
ConversationView: add current user to conversations, according to Mastodon behaviour
|
4 years ago |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
4 years ago |
|
feld
|
a326a56371
|
Merge branch 'fix/frontend-cli-docs' into 'develop'
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
feld
|
6d7dc1241c
|
Merge branch 'mutes-blocks-pagination' into 'develop'
Support pagination of blocks and mutes
Closes #642
See merge request pleroma/pleroma!3080
|
4 years ago |
|
feld
|
8b3650998b
|
Merge branch 'fix/mrf-keyword-description' into 'develop'
Improve Keyword descriptions for AdminFE
See merge request pleroma/pleroma!3110
|
4 years ago |
|
Mark Felder
|
89c356d19f
|
Improve Keyword descriptions for AdminFE
|
4 years ago |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
4 years ago |
|
feld
|
0e0a6aef70
|
Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'
Fix: User.is_discoverable attribute rendering in Admin API User view
See merge request pleroma/pleroma!3107
|
4 years ago |
|
Ivan Tashkinov
|
9f5f7dc9f9
|
Fixed User.is_discoverable attribute rendering in Admin API User view.
|
4 years ago |
|
feld
|
25832534cd
|
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
|
4 years ago |
|
Ivan Tashkinov
|
da4a1e57b1
|
@doc fix.
|
4 years ago |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
feld
|
342c2e1bc0
|
Merge branch 'issue/2261' into 'develop'
[#2261] FrontStatic plug: excluded invalid url
See merge request pleroma/pleroma!3106
|
4 years ago |
|
Mark Felder
|
d2b140a525
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
4f90077767
|
Fix warning
|
4 years ago |
|
feld
|
1204aaa2e3
|
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
|
4 years ago |
|
Haelwenn
|
d8d4bd15d0
|
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
|
4 years ago |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
f2b74f60f0
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
7d31122781
|
Merge branch 'fix/prometheus-test' into 'develop'
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
See merge request pleroma/pleroma!3105
|
4 years ago |
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
4 years ago |
|
Mark Felder
|
cbe41408e4
|
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
4 years ago |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
lain
|
2f7401806b
|
Merge branch 'docs/clients-apc2s' into 'develop'
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
|
4 years ago |
|
lain
|
de6d49c8ce
|
ActivityPub: Add back debug call + explanation.
|
4 years ago |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
4 years ago |
|
rinpatch
|
e6dab6513d
|
Merge branch 'patch-1' into 'develop'
Fix link reference
See merge request pleroma/pleroma!3103
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1de4ff8b4d
|
clients.md: Add AndStatus, note supported protocols
|
4 years ago |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
Kana
|
ac692ff3e9
|
Fix link reference
|
4 years ago |
|
Haelwenn
|
2fd384e0a2
|
Merge branch 'fix/sendmail' into 'develop'
Fix ability to use sendmail on Linux distros with systemd
See merge request pleroma/pleroma!3102
|
4 years ago |
|
Mark Felder
|
e7b0840b88
|
NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
|
4 years ago |
|
rinpatch
|
df61071422
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
4 years ago |
|
lain
|
a999e8b0b7
|
Changelog: Add info about whitespace name remote users.
|
4 years ago |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
4 years ago |
|
Haelwenn
|
096e4518ad
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3100
|
4 years ago |
|
shironeko
|
bd033aba48
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 45.2% (48 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
Ivan Tashkinov
|
14900164b8
|
[#3059] Used forked prometheus-phx to remove log spam.
|
4 years ago |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
4 years ago |
|
rinpatch
|
d031b185e2
|
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
|
4 years ago |
