Egor Kislitsyn
|
dbee53c2df
|
Remove unused Pleroma.User.info_fields/0
|
5 years ago |
|
Ivan Tashkinov
|
c0246309a5
|
[#1304] Extra bullet-proofing.
|
5 years ago |
|
Ivan Tashkinov
|
065e9fac12
|
[#1304] Adjusted User.Info references from Notification.
|
5 years ago |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Ivan Tashkinov
|
11cd994425
|
[#1304] Fixed null::jsonb handling in User.Info migration.
|
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 |
|
rinpatch
|
6712b6e4de
|
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
|
5 years ago |
|
rinpatch
|
2dbee29cf5
|
Do not include notifications from blocked users when with_muted is set
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
|
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
|
b4cbf0568b
|
[#1304] Analysis issue fix.
|
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
|
95871cb462
|
user: implement User.invisible?/1
|
5 years ago |
|
Ariadne Conill
|
1469a084d4
|
relay: set invisible to true
|
5 years ago |
|
Ariadne Conill
|
e7333db72a
|
user info: add invisible field
|
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 |
|
rinpatch
|
fd6d05dc45
|
Merge branch 'mix-emoji-task-pack-json' into 'develop'
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
|
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
|
44e64af5e7
|
object: containment: simplify the pattern match for OStatus testsuite hack
|
5 years ago |
|
Ariadne Conill
|
e99fdfc32d
|
object: containment: only allow OStatus references in test suite environment
|
5 years ago |
|
Ariadne Conill
|
3c785b85a6
|
object: fetcher: fix up formatting
|
5 years ago |
|
Ariadne Conill
|
bae96de273
|
activitypub: tag containment checks for better error tracing
|
5 years ago |
|
Ariadne Conill
|
7295a05cee
|
object: containment: also allow OStatus object IDs through when comparing origins
|
5 years ago |
|
Ariadne Conill
|
a177f22e02
|
object: fetcher: improve error reporting
|
5 years ago |
|
Ariadne Conill
|
bf2107743f
|
object: containment: don't try to contain ostatus objects
|
5 years ago |
|
Ariadne Conill
|
6f110fc04c
|
object fetcher: fix up error handling
|
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 |
|
Ariadne Conill
|
25b7ff56c3
|
application: don't start Federator.init/1 anymore
|
5 years ago |
|
rinpatch
|
39e996528c
|
Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
3c6fd0bb99
|
upload.ex: Remove deprecated configuration
|
5 years ago |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
