Merge remote-tracking branch 'origin/develop' into global-status-expiration
[akkoma] / lib / pleroma / web / mastodon_api / websocket_handler.ex
2020-03-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-18 Mark FelderMerge branch 'develop' into feature/push-subject-for-dm
2019-10-18 rinpatchMerge branch 'patch-1' into 'develop'
2019-10-18 Maxim FilippovMerge branch 'develop' into feature/relay-list
2019-10-18 kaniiniMerge branch 'fix-streaming-with-sec-websocket-protocol...
2019-10-18 kaniiniApply suggestion to lib/pleroma/web/mastodon_api/websoc...
2019-10-15 kPheroxAdd `Sec-WebSocket-Protocol` to response header
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 kaniiniMerge branch 'bugfix/widen-streamer-blocks-for-1.1...
2019-10-04 Egor KislitsynRevert "Merge branch 'revert-4fabf83a' into 'develop'"
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-18 feldMerge branch 'restore-tests' into 'develop'
2019-09-17 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-17 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-17 rinpatchMerge branch 'support/tests' into 'develop'
2019-09-16 Roman ChvanikovMerge develop
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/return-total-for...
2019-09-16 rinpatchMerge branch 'fix/develop' into 'develop'
2019-09-16 Egor KislitsynRevert "Merge branch 'revert-4fabf83a' into 'develop'"
2019-09-16 kaniiniMerge branch 'revert-4fabf83a' into 'develop'
2019-09-16 kaniiniRevert "Merge branch 'streamer-refactoring' into 'develop'"
2019-09-16 kaniiniMerge branch 'streamer-refactoring' into 'develop'
2019-09-16 Steven FuchsStreamer refactoring
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream...
2019-07-09 Roman ChvanikovMerge develop
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query...
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop'
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header...
2019-07-07 Haelwenn (lanodan... MastoAPI Streaming: Keep compatibility with access_token
2019-07-06 KokaKiwiMastoAPI streaming: Replace access_token with Sec-WebSo...
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop'
2019-06-16 rinpatchMerge branch 'issues/570' into 'develop'
2019-06-16 Maksim[#570] add user:notification stream
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 kaniiniMerge branch 'get-cached-everywhere' into 'develop'
2019-04-22 EgorUse `User.get_cached*` everywhere
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop'
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop'
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop'
2019-04-02 lambdaMerge branch 'remove-user-activities' into 'develop'
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 lambdaMerge branch 'features/mastoapi/2.6.0-force-login-optio...
2019-04-02 lambdaMerge branch 'get_by_id' into 'develop'
2019-04-02 Egor Kislitsynchange `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
next