lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
|
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
|
rinpatch
|
8404f8c8fb
|
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
|
5 years ago |
|
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
5 years ago |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
Egor Kislitsyn
|
624e720aa4
|
Add `with_move` query param to the notifications API
|
5 years ago |
|
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
5 years ago |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
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 |
|
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
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
|
5 years ago |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
5 years ago |
|
Roman Chvanikov
|
76c3e290fc
|
Merge develop
|
5 years ago |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
5 years ago |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
5 years ago |
|
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
5 years ago |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
5 years ago |
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Ariadne Conill
|
492d854e7a
|
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
|
5 years ago |
|
Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Mark Felder
|
ec7b085b76
|
Fix test
|
5 years ago |
|
Mark Felder
|
fd287387a0
|
Do not notify subscribers for messages from users which are replies to others
|
5 years ago |
|
Roman Chvanikov
|
c729883936
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Alexander Strizhakov
|
e7c39b7ac8
|
Feature/1072 muting notifications
|
5 years ago |
|
Roman Chvanikov
|
657277ffc0
|
Resolve conflicts
|
5 years ago |
|
Maksim
|
a04bf131e0
|
[#570] add user:notification stream
|
5 years ago |
|
Mark Felder
|
6ef145b4fc
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
William Pitcock
|
45e4642a58
|
tests: chase remote/local removal
|
5 years ago |
|
William Pitcock
|
0f7eeb0943
|
tests: add tests for non-follows/non-followers settings
|
5 years ago |
|
Roman Chvanikov
|
0f0cc2703b
|
Merge develop
|
5 years ago |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
5 years ago |
|
Roman Chvanikov
|
724311e151
|
Fix Credo warnings
|
6 years ago |
|
Roman Chvanikov
|
bc7862106d
|
Fix tests
|
6 years ago |
|
Roman Chvanikov
|
aeafa0b2ef
|
Add Notification.for_user_since/2
|
6 years ago |
|
Roman Chvanikov
|
2f0203a4a1
|
Resolve conflicts
|
6 years ago |
|
Roman Chvanikov
|
dc21181f65
|
Update updated_at field on notification read
|
6 years ago |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
6 years ago |
|
Sadposter
|
76fdfd1c7f
|
Add check on activity visibility in sub notification
|
6 years ago |
|
Sadposter
|
a270e7a191
|
Mix format everything
|
6 years ago |
|
Sadposter
|
f6e131eeb9
|
Don't use twitterAPI for subscription tests
|
6 years ago |
