Haelwenn
|
9c09ea01aa
|
Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls
See merge request pleroma/pleroma!3120
|
2020-11-04 14:44:45 +00:00 |
|
lain
|
bc4d9c4ffc
|
Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
|
2020-11-04 13:48:15 +00:00 |
|
Egor Kislitsyn
|
ca95cbe0b4
|
Add with_muted param to ChatController.index/2
|
2020-11-04 16:40:12 +04:00 |
|
lain
|
1cfc3278c0
|
Poll View: Always return voters_count.
|
2020-11-04 10:14:00 +01: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 |
|
Mark Felder
|
53dd048590
|
Test the note is returned when fetching a single report
|
2020-11-02 15:49:07 -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 |
|
Haelwenn (lanodan) Monnier
|
4caad4e910
|
side_effects: Don’t increase_replies_count when it’s an Answer
|
2020-11-02 05:56:17 +01:00 |
|
feld
|
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 |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
2020-10-31 05:50:59 +03:00 |
|
Egor Kislitsyn
|
a2a7a1f2ff
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-31 00:17:33 +04: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 |
|
Alibek Omarov
|
1042c30fa5
|
ConversationViewTest: fix test
|
2020-10-30 13:59:53 +01:00 |
|
Alibek Omarov
|
0552a08dfd
|
ConversationControllerTest: fix test, fix formatting
|
2020-10-30 13:59:53 +01:00 |
|
Alibek Omarov
|
9b93eef715
|
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
|
2020-10-30 13:59:53 +01:00 |
|
Alibek Omarov
|
630eb0f939
|
ConversationViewTest: fix test #2
|
2020-10-30 12:58:51 +01:00 |
|
Alibek Omarov
|
149589c842
|
ConversationViewTest: fix test
|
2020-10-30 12:58:51 +01:00 |
|
Alibek Omarov
|
390a12d4c8
|
ConversationControllerTest: fix test
|
2020-10-30 12:58:51 +01: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 |
|
feld
|
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 |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
2020-10-29 15:35:42 +04: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 |
|
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 |
|
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 |
|
Mark Felder
|
f2b74f60f0
|
Merge branch 'develop' into feature/account-export
|
2020-10-27 15:16:22 -05: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 |
|
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
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
2020-10-26 16:30:48 +01: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
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
2020-10-23 13:53:01 +02: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 |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
2020-10-22 12:22:08 +02:00 |
|
Maksim Pechnikov
|
ef627b9391
|
fix module name
|
2020-10-22 12:04:23 +03:00 |
|
Maksim Pechnikov
|
60663150b5
|
admin user search: added filter by actor_type
|
2020-10-22 11:53:28 +03:00 |
|
Maksim Pechnikov
|
46b420aa60
|
need_confirmed -> unconfirmed
|
2020-10-22 11:50:49 +03:00 |
|
Maksim Pechnikov
|
cf4f393794
|
added AdminApi.UserController
|
2020-10-22 11:50:49 +03:00 |
|
Maksim Pechnikov
|
9ef46ce410
|
added 'unconfirmed' filter to admin/users
|
2020-10-22 11:50:49 +03:00 |
|
Egor Kislitsyn
|
034ac43f3a
|
Fix credo warnings
|
2020-10-20 17:47:04 +04:00 |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-20 17:27:29 +04:00 |
|