projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
little cleanup
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
websocket_handler.ex
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
2019-10-21
Maksim Pechnikov
Merge branch 'develop' into feature/masto_api_markers
blob
|
commitdiff
|
raw
2019-10-21
Egor Kislitsyn
Merge branch 'develop' into refactor/following-relation...
blob
|
commitdiff
|
raw
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
blob
|
commitdiff
|
raw
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
2019-10-18
kaniini
Merge branch 'fix-streaming-with-sec-websocket-protocol...
blob
|
commitdiff
|
raw
2019-10-18
kaniini
Apply suggestion to lib/pleroma/web/mastodon_api/websoc...
blob
|
commitdiff
|
raw
2019-10-15
kPherox
Add `Sec-WebSocket-Protocol` to response header
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
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
lain
Merge remote-tracking branch 'origin/develop' into...
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-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
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-08-24
lain
Merge branch 'admin-create-users' 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-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Ivan Tashkinov
[#878] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'features/sec-websocket-protocol-header...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-07
Haelwenn (lanodan...
MastoAPI Streaming: Keep compatibility with access_token
blob
|
commitdiff
|
raw
|
diff to current
2019-07-06
KokaKiwi
MastoAPI streaming: Replace access_token with Sec-WebSo...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
Haelwenn
Merge branch 'fix/sanitize-report-content' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
rinpatch
Merge branch 'issues/570' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
Maksim
[#570] add user:notification stream
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Egor Kislitsyn
Merge branch 'develop' into feature/disable-account
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor
Use `User.get_cached*` everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'feature/fake-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/share-mastodon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'remove-user-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/mastoapi/2.6.0-force-login-optio...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
change `Repo.get(User, id)` => `User.get_by_id(id)`
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
kaniini
Merge branch 'feature/add-pagination-to-users-admin...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
lambda
Merge branch 'fix/dont-show-dms-in-mentions-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-02
rinpatch
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-01
lambda
Merge branch 'feature/cowboy2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
William Pitcock
mastodon websocket: return errors using ok, not stop
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
William Pitcock
mastodon websocket: bring back infinity timeout
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
William Pitcock
mastodon websocket: use pattern match to get query...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
William Pitcock
mastodon api: websocket: update code for cowboy 2.x
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
next