feld
|
6d7dc1241c
|
Merge branch 'mutes-blocks-pagination' into 'develop'
Support pagination of blocks and mutes
Closes #642
See merge request pleroma/pleroma!3080
|
2020-10-29 21:02:35 +00:00 |
|
feld
|
8b3650998b
|
Merge branch 'fix/mrf-keyword-description' into 'develop'
Improve Keyword descriptions for AdminFE
See merge request pleroma/pleroma!3110
|
2020-10-29 19:39:23 +00:00 |
|
Mark Felder
|
89c356d19f
|
Improve Keyword descriptions for AdminFE
|
2020-10-29 14:22:07 -05:00 |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
2020-10-29 15:35:42 +04:00 |
|
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
|
2020-10-29 07:18:49 +00:00 |
|
Ivan Tashkinov
|
9f5f7dc9f9
|
Fixed User.is_discoverable attribute rendering in Admin API User view.
|
2020-10-28 22:29:52 +03:00 |
|
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
|
2020-10-28 18:08:51 +00:00 |
|
Ivan Tashkinov
|
da4a1e57b1
|
@doc fix.
|
2020-10-28 19:09:38 +03:00 |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
2020-10-28 19:03:40 +03:00 |
|
feld
|
342c2e1bc0
|
Merge branch 'issue/2261' into 'develop'
[#2261] FrontStatic plug: excluded invalid url
See merge request pleroma/pleroma!3106
|
2020-10-28 15:06:47 +00:00 |
|
Mark Felder
|
d2b140a525
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
|
2020-10-28 08:48:26 -05:00 |
|
feld
|
1204aaa2e3
|
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
|
2020-10-27 22:55:31 +00:00 |
|
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
|
2020-10-27 22:44:31 +00:00 |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 22:13:50 +00:00 |
|
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
|
2020-10-27 20:05:09 +00:00 |
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
2020-10-27 22:59:27 +03:00 |
|
Mark Felder
|
cbe41408e4
|
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
|
2020-10-27 14:37:48 -05:00 |
|
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
|
2020-10-27 17:47:56 +00:00 |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
2020-10-27 17:42:24 +00:00 |
|
lain
|
2f7401806b
|
Merge branch 'docs/clients-apc2s' into 'develop'
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
|
2020-10-26 15:59:10 +00:00 |
|
lain
|
de6d49c8ce
|
ActivityPub: Add back debug call + explanation.
|
2020-10-26 16:33:26 +01:00 |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
2020-10-26 16:30:48 +01:00 |
|
rinpatch
|
e6dab6513d
|
Merge branch 'patch-1' into 'develop'
Fix link reference
See merge request pleroma/pleroma!3103
|
2020-10-26 11:33:16 +00:00 |
|
Haelwenn (lanodan) Monnier
|
1de4ff8b4d
|
clients.md: Add AndStatus, note supported protocols
|
2020-10-26 03:23:47 +01:00 |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
2020-10-26 02:09:20 +00:00 |
|
Kana
|
ac692ff3e9
|
Fix link reference
|
2020-10-25 08:28:17 +00:00 |
|
Haelwenn
|
2fd384e0a2
|
Merge branch 'fix/sendmail' into 'develop'
Fix ability to use sendmail on Linux distros with systemd
See merge request pleroma/pleroma!3102
|
2020-10-23 23:29:17 +00:00 |
|
Mark Felder
|
e7b0840b88
|
NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
|
2020-10-23 15:32:32 -05:00 |
|
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
|
2020-10-23 19:39:42 +00:00 |
|
lain
|
a999e8b0b7
|
Changelog: Add info about whitespace name remote users.
|
2020-10-23 13:55:08 +02:00 |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
2020-10-23 13:53:01 +02:00 |
|
Haelwenn
|
096e4518ad
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3100
|
2020-10-22 22:26:47 +00:00 |
|
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/
|
2020-10-22 20:34:02 +00:00 |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
2020-10-22 20:33:52 +00:00 |
|
Ivan Tashkinov
|
14900164b8
|
[#3059] Used forked prometheus-phx to remove log spam.
|
2020-10-22 17:58:25 +03:00 |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
2020-10-22 14:07:33 +03:00 |
|
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
|
2020-10-22 10:56:17 +00:00 |
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
2020-10-22 13:54:15 +03:00 |
|
lain
|
3fdc2a0d1e
|
Changelog: Add information about self-chats
|
2020-10-22 12:23:07 +02:00 |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
2020-10-22 12:22:08 +02:00 |
|
Haelwenn
|
77e827bb66
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install libmagic-dev in debian release targets
See merge request pleroma/pleroma!3096
|
2020-10-20 21:15:48 +00:00 |
|
Haelwenn (lanodan) Monnier
|
54d99cbb72
|
CI: Install libmagic-dev in debian release targets
|
2020-10-20 22:10:20 +02:00 |
|
Ivan Tashkinov
|
50d4280880
|
[#1668] Formatting fix.
|
2020-10-20 16:18:24 +03:00 |
|
Ivan Tashkinov
|
3a28aa8814
|
[#1668] Added :prometheus group config to config/description.exs.
|
2020-10-20 15:13:20 +03:00 |
|
Haelwenn
|
44b2a137d1
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
|
2020-10-20 00:47:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
ccd1e75e35
|
CI: Install file-dev in alpine release targets
|
2020-10-20 02:37:08 +02:00 |
|
Haelwenn
|
fe160330e6
|
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
|
2020-10-19 23:16:24 +00:00 |
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
2020-10-19 15:46:24 +02:00 |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
2020-10-19 15:40:50 +02:00 |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +04:00 |
|