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
|
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 |
|
|
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
|
d1698267a2
|
Fix credo warning
|
2020-10-31 00:26:11 +04:00 |
|
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
2020-10-30 19:34:02 +04:00 |
|
|
Alibek Omarov
|
d63ec02f31
|
ConversationView: 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
|
241bd061fc
|
ConversationView: add current user to conversations, according to Mastodon behaviour
|
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
|
9f5f7dc9f9
|
Fixed User.is_discoverable attribute rendering in Admin API User view.
|
2020-10-28 22:29:52 +03: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 |
|
|
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 |
|
|
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 |
|
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
2020-10-27 22:59:27 +03: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
2020-10-22 14:07:33 +03:00 |
|
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
2020-10-22 13:54:15 +03: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
|
44e5a57d1a
|
admin api: added user filters by actor_types
|
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 |
|
|
Egor Kislitsyn
|
ad605e3e16
|
Rename Pleroma.Backup to Pleroma.User.Backup
|
2020-10-20 17:16:58 +04: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
|
98f32cf820
|
Fix tests
|
2020-10-19 17:19:45 +04:00 |
|
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
2020-10-19 15:40:03 +04:00 |
|
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
2020-10-19 04:26:35 +00:00 |
|
|
Ivan Tashkinov
|
524fb0e4c2
|
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
|
2020-10-18 21:22:21 +03:00 |
|
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
2020-10-17 17:53:47 +03:00 |
|
|
Ivan Tashkinov
|
d54233760f
|
[#3053] Post-merge fix.
|
2020-10-17 13:33:57 +03:00 |
|