Haelwenn
0d8cc0905a
Merge branch 'fix/get_report_with_notes' into 'develop'
...
Permit fetching individual reports with notes preloaded
See merge request pleroma/pleroma!3118
2020-11-03 01:00:12 +00:00
0fd2830fe1
Merge branch 'chore/deps-from-git' into 'develop'
...
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
See merge request pleroma/pleroma!3119
2020-11-02 23:28:16 +00:00
Mark Felder
2f2281fdf1
Ensure URLs for git repos end in .git for older git clients like on CentOS 7
2020-11-02 17:09:56 -06:00
Mark Felder
53dd048590
Test the note is returned when fetching a single report
2020-11-02 15:49:07 -06:00
Mark Felder
7efc074ead
Permit fetching individual reports with notes preloaded
2020-11-02 13:06:59 -06:00
lain
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
Haelwenn (lanodan) Monnier
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
9fbe9ef774
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
2020-11-01 19:31:17 +00:00
Ekaterina Vaartis
8f00d90f91
Use Pleroma.HTTP instead of Tesla
...
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
2020-11-01 12:05:39 +03:00
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
37e8e8bf8e
Merge branch 'idempotency-key-optimistic-posting' into 'develop'
...
Add `idempotency_key` to the chat message entity
Closes #2126
See merge request pleroma/pleroma!3015
2020-10-31 17:01:29 +00:00
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
Egor Kislitsyn
d1698267a2
Fix credo warning
2020-10-31 00:26:11 +04:00
Egor Kislitsyn
a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-31 00:17:33 +04:00
4fbdd1c8a1
Merge branch 'remove-unused-aliases' into 'develop'
...
Remove unused aliases
See merge request pleroma/pleroma!3111
2020-10-30 17:28:58 +00:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Egor Kislitsyn
1a98476f48
Remove unused aliases
2020-10-30 18:42:43 +04:00
Haelwenn
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
a326a56371
Merge branch 'fix/frontend-cli-docs' into 'develop'
...
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
2020-10-29 21:06:42 +00:00
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
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
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
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
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
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
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
Egor Kislitsyn
4f90077767
Fix warning
2020-10-28 15:32:44 +04:00
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
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
Mark Felder
f2b74f60f0
Merge branch 'develop' into feature/account-export
2020-10-27 15:16:22 -05:00
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
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
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
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
