Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
feld
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Egor Kislitsyn
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
lain
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
4 years ago
Ivan Tashkinov
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
4 years ago
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
lain
bb9650f3c2
FrontendController: Return error on installation error.
4 years ago
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Maksim Pechnikov
e4b202d905
added test
4 years ago
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov
36ec604521
added test
4 years ago
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
4 years ago
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
4 years ago
lain
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
Egor Kislitsyn
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
4 years ago
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn
d83c2bd330
Add support for install via `file` and `build_url` params
4 years ago
Egor Kislitsyn
03e306785b
Add an API endpoint to install a new frontend
4 years ago
Haelwenn (lanodan) Monnier
aafdc975bd
federation_status: Add ApiSpec
4 years ago
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
4 years ago
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Egor Kislitsyn
6734abcbd4
Add pagination for Mutes
4 years ago
Egor Kislitsyn
33f4f39b1c
Add pagination for Blocks
4 years ago
Alexander Strizhakov
b5b4395e4a
oauth consistency
4 years ago
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Egor Kislitsyn
86ce4afd93
Improve backup urls
4 years ago
Egor Kislitsyn
2c73bfe122
Add API endpoints for Backups
4 years ago
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
Maksim Pechnikov
de993b856b
added `force` option to the unfollow operation
4 years ago
Alexander Strizhakov
5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
4 years ago
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
4 years ago
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
4 years ago
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
4 years ago