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
/
web
/
mastodon_api
/
views
/
2019-10-22
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/push-subject-for-dm' into 'develop'
tree
|
commitdiff
2019-10-21
rinpatch
Merge branch 'fix/notifs-exclude-blocked-from-with...
tree
|
commitdiff
2019-10-21
kaniini
Merge branch 'feature/masto_api_markers' into 'develop'
tree
|
commitdiff
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
tree
|
commitdiff
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
tree
|
commitdiff
2019-10-17
Maksim Pechnikov
add Markers /api/v1/markers
tree
|
commitdiff
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-10
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-10-06
Haelwenn
Merge branch 'fix-prameter-name-of-accounts-update...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'split-masto-api/leftovers' into 'develop'
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'accept-embedded-announce-object' into...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'unread-conversation-count' into 'develop'
tree
|
commitdiff
2019-10-05
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-05
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
tree
|
commitdiff
2019-10-05
kaniini
Merge branch 'revert-5c04e817' into 'develop'
tree
|
commitdiff
2019-10-05
kaniini
Revert "Merge branch 'user-info-unread-direct-conversat...
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
tree
|
commitdiff
2019-10-04
kaniini
Merge branch 'user-info-unread-direct-conversation...
tree
|
commitdiff
2019-10-04
feld
Merge branch 'develop' into 'fix/extended-nickname...
tree
|
commitdiff
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
tree
|
commitdiff
2019-10-04
lain
Merge branch 'fix/nickname-fail' into 'develop'
tree
|
commitdiff
2019-10-04
lain
Merge branch 'bugfix/notification-nil-actor' into ...
tree
|
commitdiff
2019-10-04
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-10-04
Haelwenn (lanodan...
notification_view.ex: Make sure `account` isn’t empty
tree
|
commitdiff
2019-10-03
eugenijm
Mastodon API: Add `pleroma.unread_conversation_count...
tree
|
commitdiff
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-10-02
rinpatch
Merge branch 'split-masto-api/masto_fe_and_custom_emoji...
tree
|
commitdiff
2019-10-02
Egor Kislitsyn
Add MastoFEController
tree
|
commitdiff
2019-10-02
Egor Kislitsyn
Add CustomEmojiController
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'split-masto-api/instance' into 'develop'
tree
|
commitdiff
2019-10-02
Egor Kislitsyn
Extract instance actions from `MastodonAPIController...
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'feature/send-identifier-on-oauth-error...
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'split-masto-api/auth' into 'develop'
tree
|
commitdiff
2019-10-02
kaniini
Merge branch 'features/private-reblogs' into 'develop'
tree
|
commitdiff
2019-10-01
Thibaut Girka
Fix returned visibility of announces in MastodonAPI
tree
|
commitdiff
2019-10-01
kaniini
Merge branch 'split-masto-api/polls' into 'develop'
tree
|
commitdiff
2019-10-01
Egor Kislitsyn
Extract poll actions from `MastodonAPIController` to...
tree
|
commitdiff
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'split-masto-api/accounts' into 'develop'
tree
|
commitdiff
2019-09-30
Egor Kislitsyn
Fix merge
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'split-masto-api/reports' into 'develop'
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'split-masto-api/conversations' into ...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'cleanup/drop-subscription-table-if-exists...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'feature/scrobbling' into 'develop'
tree
|
commitdiff
2019-09-30
Egor Kislitsyn
Extract report actions from `MastodonAPIController...
tree
|
commitdiff
2019-09-30
Ariadne Conill
pleroma api: hook up scrobbler controller
tree
|
commitdiff
2019-09-30
Ariadne Conill
mastodon api: implement rendering of listen activities
tree
|
commitdiff
2019-09-30
Egor Kislitsyn
Extract conversation actions from `MastodonAPIControlle...
tree
|
commitdiff
2019-09-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
tree
|
commitdiff
2019-09-28
Haelwenn
Merge branch 'tests/mastodon_api_controller.ex' into...
tree
|
commitdiff
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'split-masto-api/follow-requests' into...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'split-masto-api/domain-blocks' into ...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'split-masto-api/scheduled-statuses' into...
tree
|
commitdiff
2019-09-27
Egor Kislitsyn
Cleanup ScheduledActivityView
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'refactor/status-controller' into 'develop'
tree
|
commitdiff
2019-09-27
Ariadne Conill
mastodon api: implement follow_requests_count
tree
|
commitdiff
2019-09-27
Egor Kislitsyn
Move view logic from StatusController.context to Status...
tree
|
commitdiff
2019-09-27
Egor Kislitsyn
Extract status actions from `MastodonAPIController...
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
tree
|
commitdiff
2019-09-26
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
tree
|
commitdiff
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-26
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'activitypub/add-discoverable-parameter...
tree
|
commitdiff
2019-09-26
Hakaba Hitoyo
Revert "add _discoverable_ keyword into ActivityPub...
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
tree
|
commitdiff
2019-09-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
tree
|
commitdiff
2019-09-24
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-23
Maksim Pechnikov
updated tests
tree
|
commitdiff
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-22
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
tree
|
commitdiff
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
tree
|
commitdiff
2019-09-19
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
tree
|
commitdiff
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
tree
|
commitdiff
2019-09-18
rinpatch
Merge branch 'chores/bump-copyright-year' into 'develop'
tree
|
commitdiff
2019-09-18
feld
Merge branch 'hide-follower-following-count' into ...
tree
|
commitdiff
2019-09-17
eugenijm
Mastodon API: Add a setting to hide follow/follower...
tree
|
commitdiff
2019-09-16
Roman Chvanikov
Move subscription notifications to a separate controller
tree
|
commitdiff
2019-09-16
Roman Chvanikov
Code style fixes
tree
|
commitdiff
2019-09-16
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
tree
|
commitdiff
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
tree
|
commitdiff
2019-09-15
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-15
Maksim Pechnikov
Merge branch 'develop' into support/tests
tree
|
commitdiff
2019-09-14
rinpatch
Merge branch 'fix/truncate-remote-user-fields' into...
tree
|
commitdiff
2019-09-14
Roman Chvanikov
Merge branch 'develop' into refactor/subscription
tree
|
commitdiff
2019-09-14
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
next