projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
notification.ex
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
2019-10-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-10-24
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-10-23
feld
Merge branch '1304-user-info-deprecation' into 'develop'
blob
|
commitdiff
|
raw
2019-10-23
Ivan Tashkinov
[#1304] Adjusted User.Info references from Notification.
blob
|
commitdiff
|
raw
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-22
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
kaniini
Merge branch 'feature/push-subject-for-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
rinpatch
Merge branch 'fix/notifs-exclude-blocked-from-with...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
rinpatch
Do not include notifications from blocked users when...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-20
Ivan Tashkinov
[#1304] Moved remaining fields from User.Info to User.
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
kaniini
Merge branch 'fix-streaming-with-sec-websocket-protocol...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
Ivan Tashkinov
[#1304] Moved all non-mutes / non-blocks fields from...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
lain
Merge branch 'benchmark-finishing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-15
Maxim Filippov
DELETE /api/pleroma/admin/users now accepts nicknames...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-14
feld
Merge branch 'exclude-visibilities-for-timelines' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-13
eugenijm
Mastodon API: Add `exclude_visibilities` parameter...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
kaniini
Merge branch 'feature/send-identifier-on-oauth-error...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
rinpatch
Merge branch 'develop' into cleanup/drop-subscription...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
rinpatch
Merge branch 'revert/subscription-refactoring' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
rinpatch
Revert subscription refactoring.
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/status-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/subscription' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Egor Kislitsyn
Replace `Pleroma.FlakeId` with `flake_id` hex package
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
feld
Merge branch 'restore-tests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
rinpatch
Merge branch 'support/tests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
rinpatch
Merge branch 'fix/develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Egor Kislitsyn
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
kaniini
Merge branch 'revert-4fabf83a' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
kaniini
Revert "Merge branch 'streamer-refactoring' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
kaniini
Merge branch 'streamer-refactoring' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Steven Fuchs
Streamer refactoring
blob
|
commitdiff
|
raw
|
diff to current
2019-09-14
rinpatch
Merge branch 'fix/truncate-remote-user-fields' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-14
Roman Chvanikov
Merge branch 'develop' into refactor/subscription
blob
|
commitdiff
|
raw
|
diff to current
2019-09-13
Roman Chvanikov
Separate Subscription Notifications from regular Notifi...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
rinpatch
Merge branch 'so-long-twitterapi' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
Haelwenn
Merge branch 'feature/mastoapi-accounts-external' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
rinpatch
Merge branch 'dockerfile-touchups' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Haelwenn
Merge branch 'feature/mastoapi-read-notifications'...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
rinpatch
Apply suggestion to lib/pleroma/notification.ex
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
rinpatch
Extend `/api/pleroma/notifications/read` to mark multip...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-03
Maxim Filippov
Return "total" optionally
blob
|
commitdiff
|
raw
|
diff to current
2019-09-02
Maxim Filippov
Return total from pagination + tests
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-09
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge branch 'feature/digest-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
rinpatch
Merge branch 'bugfix/poll-id-as-string' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
feld
Merge branch 'match-file-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
kaniini
Merge branch 'fix/1091-notifications-query' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Alex S
query fix
blob
|
commitdiff
|
raw
|
diff to current
next