lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
lain
92d252f364
Poll Schema: Update and fix.
2020-11-04 10:20:09 +01:00
lain
f09bb814a9
Changelog: Add info about poll view changes
2020-11-04 10:14:48 +01:00
lain
1cfc3278c0
Poll View: Always return voters_count.
2020-11-04 10:14:00 +01:00
lain
ba3f3a5a56
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
...
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
2020-11-03 13:12:39 +00:00
lain
f7a3dcd320
Merge branch 'patch-4' into 'develop'
...
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled
Closes #2217
See merge request pleroma/pleroma!3089
2020-11-03 13:11:36 +00:00
lain
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
lain
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
Haelwenn (lanodan) Monnier
179936609f
favicon: Update to pleroma logo, provided by @shpuld
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
2020-11-03 09:52:17 +01:00
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
Egor Kislitsyn
be52819a11
Hide chats from muted users
2020-11-02 17:51:54 +04: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
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +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
1042c30fa5
ConversationViewTest: fix test
2020-10-30 13:59:53 +01:00
d63ec02f31
ConversationView: fix formatting
2020-10-30 13:59:53 +01:00
0552a08dfd
ConversationControllerTest: fix test, fix formatting
2020-10-30 13:59:53 +01:00
5591dc0248
Add entry in changelog
2020-10-30 13:59:53 +01:00
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
2020-10-30 13:59:53 +01:00
630eb0f939
ConversationViewTest: fix test #2
2020-10-30 12:58:51 +01:00
149589c842
ConversationViewTest: fix test
2020-10-30 12:58:51 +01:00
390a12d4c8
ConversationControllerTest: fix test
2020-10-30 12:58:51 +01:00
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
2020-10-30 12:58:51 +01:00
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00: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
75d131ba18
Add documentation and update CHANGELOG
2020-10-29 16:37:51 +04:00
Egor Kislitsyn
d83c2bd330
Add support for install via file and build_url params
2020-10-29 16:37:50 +04:00
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +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
