projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
websocket_handler.ex
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
2020-03-11
feld
Merge branch 'fix/signup-without-email' into 'develop'
blob
|
commitdiff
|
raw
2020-03-11
feld
Merge branch 'relay-list-change' into 'develop'
blob
|
commitdiff
|
raw
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
2020-03-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
2020-03-04
feld
Merge branch 'exclude-reblogs-from-admin-api-by-default...
blob
|
commitdiff
|
raw
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Mark Felder
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
2020-03-03
Haelwenn
Merge branch 'chore/update-copyrights' into 'develop'
blob
|
commitdiff
|
raw
2020-03-03
Mark Felder
Update Copyrights
blob
|
commitdiff
|
raw
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
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
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-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Mark Felder
Merge branch 'develop' into feature/push-subject-for-dm
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
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-18
kaniini
Apply suggestion to lib/pleroma/web/mastodon_api/websoc...
blob
|
commitdiff
|
raw
|
diff to current
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-10-04
kaniini
Merge branch 'bugfix/widen-streamer-blocks-for-1.1...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
Egor Kislitsyn
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
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
next