Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Ariadne Conill
|
3f6a596922
|
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
|
5 years ago |
|
kaniini
|
6281e4795a
|
Merge branch 'feature/push-subject-for-dm' into 'develop'
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
|
5 years ago |
|
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged `develop`, handled User.Info.invisible.
|
5 years ago |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
5 years ago |
|
Ivan Tashkinov
|
a11a7176d5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
|
5 years ago |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
|
Ariadne Conill
|
c9280b9730
|
rework to use properties instead of compound typing, per SocialCG
|
5 years ago |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
5 years ago |
|
Ariadne Conill
|
1469a084d4
|
relay: set invisible to true
|
5 years ago |
|
Haelwenn
|
f01dbc450c
|
Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
|
5 years ago |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
5 years ago |
|
KokaKiwi
|
638457ba94
|
MastoFE: Add PWA manifest.
|
5 years ago |
|
Mark Felder
|
dcb23a85b6
|
Merge branch 'develop' into feature/push-subject-for-dm
|
5 years ago |
|
Mark Felder
|
152caef51d
|
Direct messages should provide a distinct push notification subject
|
5 years ago |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
|
Ariadne Conill
|
bae96de273
|
activitypub: tag containment checks for better error tracing
|
5 years ago |
|
Ariadne Conill
|
48059c03c9
|
fix up some tests
|
5 years ago |
|
Ariadne Conill
|
d379b48769
|
kill almost all of the OStatus module
|
5 years ago |
|
Ariadne Conill
|
6a1f4c5145
|
federator: remove OStatus incoming document support
|
5 years ago |
|
Ariadne Conill
|
835ad52378
|
remove Salmon module
|
5 years ago |
|
Ariadne Conill
|
beb9861f9d
|
router: disconnect Salmon
|
5 years ago |
|
Ariadne Conill
|
a7b92bba68
|
webfinger: stop pulling Salmon data out of WebFinger
|
5 years ago |
|
Ariadne Conill
|
c00ae10af8
|
feed: don't advertise salmon endpoint
|
5 years ago |
|
Ariadne Conill
|
adb639db56
|
publisher: move remote_users() from Salmon module
|
5 years ago |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
5 years ago |
|
Ariadne Conill
|
b16a460916
|
federator: remove websub stuff
|
5 years ago |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
|
kaniini
|
7511f3d192
|
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
|
5 years ago |
|
kaniini
|
733b73b71c
|
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
|
5 years ago |
|
eugenijm
|
359dd1890e
|
Mastodon API: Mark the conversation as read for the author when they send a new direct message
|
5 years ago |
|
Maksim Pechnikov
|
66b5d0ff55
|
add Markers /api/v1/markers
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
feld
|
21f0757b0d
|
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
|
5 years ago |
|
lain
|
6977cddff9
|
Merge branch 'benchmark-finishing' into 'develop'
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
|
5 years ago |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
|
Alexander
|
e7bb762ec2
|
don't stream in benchmark env
|
5 years ago |
|
kPherox
|
5bd0717de2
|
Add `Sec-WebSocket-Protocol` to response header
|
5 years ago |
|
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
|
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
5 years ago |
|
Maxim Filippov
|
c0aca32dd0
|
Merge branch 'develop' into feature/multiple-users-activation-permissions
|
5 years ago |
|
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
5 years ago |
|
lain
|
422aa6befe
|
Ostatus DeleteHandler: Fix for new option format.
|
5 years ago |
|
lain
|
37812740c4
|
Transmogrifier: Correctly save incoming ids for Accept/Reject.
|
5 years ago |
|
lain
|
9b963064eb
|
Transmogrifier: Actually store who deleted a note.
|
5 years ago |
|
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
5 years ago |
|
lain
|
29647dfd09
|
Transmogrifier: Save correct ids for incoming deletes.
|
5 years ago |
|
lain
|
c54ae662dc
|
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
|
5 years ago |
