lain
|
5db4c823b2
|
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
|
4 years ago |
|
Haelwenn
|
9c09ea01aa
|
Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls
See merge request pleroma/pleroma!3120
|
4 years ago |
|
lain
|
504a829edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
|
4 years ago |
|
lain
|
cb3cd3a761
|
TopicsTest: Small addition.
|
4 years ago |
|
lain
|
329aa19c9f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
|
4 years ago |
|
lain
|
bc4d9c4ffc
|
Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
|
4 years ago |
|
Egor Kislitsyn
|
ca95cbe0b4
|
Add `with_muted` param to ChatController.index/2
|
4 years ago |
|
lain
|
e46c95b826
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
|
4 years ago |
|
lain
|
c7bcbfbc1d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
|
4 years ago |
|
lain
|
1cfc3278c0
|
Poll View: Always return `voters_count`.
|
4 years ago |
|
lain
|
c37118e6f2
|
Conversations: A few refactors
|
4 years ago |
|
lain
|
91f6c32430
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
|
4 years ago |
|
Mark Felder
|
53dd048590
|
Test the note is returned when fetching a single report
|
4 years ago |
|
Egor Kislitsyn
|
be52819a11
|
Hide chats from muted users
|
4 years ago |
|
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
|
4 years ago |
|
minibikini
|
6163fbf553
|
Merge branch 'develop' into 'frontend-admin-api'
# Conflicts:
# lib/pleroma/web/router.ex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
4caad4e910
|
side_effects: Don’t increase_replies_count when it’s an Answer
|
4 years ago |
|
feld
|
38b481d112
|
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
|
4 years ago |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
4 years ago |
|
Egor Kislitsyn
|
a2a7a1f2ff
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
1a98476f48
|
Remove unused aliases
|
4 years ago |
|
Alibek Omarov
|
1042c30fa5
|
ConversationViewTest: fix test
|
4 years ago |
|
Alibek Omarov
|
0552a08dfd
|
ConversationControllerTest: fix test, fix formatting
|
4 years ago |
|
Alibek Omarov
|
9b93eef715
|
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
|
4 years ago |
|
Alibek Omarov
|
630eb0f939
|
ConversationViewTest: fix test #2
|
4 years ago |
|
Alibek Omarov
|
149589c842
|
ConversationViewTest: fix test
|
4 years ago |
|
Alibek Omarov
|
390a12d4c8
|
ConversationControllerTest: fix test
|
4 years ago |
|
minibikini
|
1cc8e94506
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Haelwenn
|
131f3219e6
|
Merge branch 'issue/2069' into 'develop'
[#2069] unread_conversation_count
See merge request pleroma/pleroma!2939
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
Egor Kislitsyn
|
d83c2bd330
|
Add support for install via `file` and `build_url` params
|
4 years ago |
|
Egor Kislitsyn
|
fa902867c0
|
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
|
4 years ago |
|
Egor Kislitsyn
|
8542d2efee
|
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
|
4 years ago |
|
Ivan Tashkinov
|
ba50dc05a8
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
d2b140a525
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
4f90077767
|
Fix warning
|
4 years ago |
|
feld
|
1204aaa2e3
|
Merge branch 'feature/autofollowing' into 'develop'
autofollowing_nicknames
See merge request pleroma/pleroma!3087
|
4 years ago |
|
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
|
4 years ago |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
f2b74f60f0
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Maksim Pechnikov
|
d28f72a55a
|
FrontStatic plug: excluded invalid url
|
4 years ago |
|
Mark Felder
|
cbe41408e4
|
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
|
4 years ago |
|
minibikini
|
1bfd8528bb
|
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
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
|
4 years ago |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Egor Kislitsyn
|
03e306785b
|
Add an API endpoint to install a new frontend
|
4 years ago |
|
lain
|
9542c5d0f4
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
|
4 years ago |
|
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
|
4 years ago |
|
lain
|
60e379ce0b
|
User: Correctly handle whitespace names.
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
Maksim Pechnikov
|
ef627b9391
|
fix module name
|
4 years ago |
|
Maksim Pechnikov
|
add26817e3
|
update changelog
|
4 years ago |
|
Maksim Pechnikov
|
44e5a57d1a
|
admin api: added user filters by `actor_types`
|
4 years ago |
|
Maksim Pechnikov
|
60663150b5
|
admin user search: added filter by `actor_type`
|
4 years ago |
|
Maksim Pechnikov
|
46b420aa60
|
need_confirmed -> unconfirmed
|
4 years ago |
|
Maksim Pechnikov
|
cf4f393794
|
added AdminApi.UserController
|
4 years ago |
|
Maksim Pechnikov
|
9ef46ce410
|
added 'unconfirmed' filter to admin/users
|
4 years ago |
|
Egor Kislitsyn
|
034ac43f3a
|
Fix credo warnings
|
4 years ago |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
4 years ago |
|
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
4 years ago |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
4 years ago |
|
Egor Kislitsyn
|
98f32cf820
|
Fix tests
|
4 years ago |
|
Egor Kislitsyn
|
76c4e80e5a
|
Merge branch 'develop' into mutes-blocks-pagination
|
4 years ago |
|
Egor Kislitsyn
|
18a91d85e5
|
Merge branch 'develop' into feature/local-only-scope
|
4 years ago |
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
4 years ago |
|
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.
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
4 years ago |
|
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
aafdc975bd
|
federation_status: Add ApiSpec
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3b5a7a6b14
|
federation_status: New endpoint showing unreachable instances
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated `pleroma.env`
|
4 years ago |
|
Egor Kislitsyn
|
2a475622ee
|
Add Pleroma.Constants.as_local_public/0
|
4 years ago |
|
Egor Kislitsyn
|
4f79bbbc31
|
Add local-only statuses
|
4 years ago |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
4 years ago |
|
lain
|
7a2f100061
|
ActivityPub: Show own replies to muted users.
Aligns mute with block behavior.
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
2013705690
|
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
|
4 years ago |
|
Haelwenn
|
9a85ec0da0
|
Merge branch 'refactor/locked_user_field' into 'develop'
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
|
4 years ago |
|
Mark Felder
|
ed61002815
|
Undo API breaking changes
|
4 years ago |
|
Mark Felder
|
b001237b79
|
Finish undoing API breakage
|
4 years ago |
|
Mark Felder
|
3242cfef20
|
Undo API breaking changes
|
4 years ago |
|
Alex Gleason
|
755f58168b
|
Merge remote-tracking branch 'upstream/develop' into restrict-domain
|
4 years ago |
|
Mark Felder
|
8b20c4d275
|
Missed tests
|
4 years ago |
|
Egor Kislitsyn
|
6734abcbd4
|
Add pagination for Mutes
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f5d8af1db1
|
Move Consistency.FileLocation to ./test
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
|
4 years ago |
|
Mark Felder
|
09be8cb336
|
Credo
|
4 years ago |
|
Egor Kislitsyn
|
33f4f39b1c
|
Add pagination for Blocks
|
4 years ago |
|
Mark Felder
|
40f3cdc030
|
JPEG content_type must be image/jpeg
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
409f694e4f
|
Merge branch 'develop' into refactor/locked_user_field
|
4 years ago |
