projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge develop
[akkoma] / lib / pleroma / web / mastodon_api / websocket_handler.ex
2019-09-16 Roman ChvanikovMerge develop blob | commitdiff | raw
2019-09-16 rinpatchMerge branch 'fix/develop' into 'develop' blob | commitdiff | raw
2019-09-16 Egor KislitsynRevert "Merge branch 'revert-4fabf83a' into 'develop'" blob | commitdiff | raw
2019-09-16 kaniiniMerge branch 'revert-4fabf83a' into 'develop' blob | commitdiff | raw | diff to current
2019-09-16 kaniiniRevert "Merge branch 'streamer-refactoring' into 'develop'" blob | commitdiff | raw | diff to current
2019-09-16 kaniiniMerge branch 'streamer-refactoring' into 'develop' blob | commitdiff | raw
2019-09-16 Steven FuchsStreamer refactoring blob | commitdiff | raw
2019-08-24 lainMerge branch 'admin-create-users' into 'develop' blob | commitdiff | raw | diff to current
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... blob | commitdiff | raw | diff to current
2019-07-11 Egor KislitsynMerge 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 ChvanikovMerge develop blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query... blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge 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 KokaKiwiMastoAPI streaming: Replace access_token with Sec-WebSo... blob | commitdiff | raw | diff to current
2019-06-28 Roman ChvanikovResolve conflicts blob | commitdiff | raw | diff to current
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header' blob | commitdiff | raw | diff to current
2019-06-16 HaelwennMerge branch 'fix/sanitize-report-content' into 'develop' blob | commitdiff | raw | diff to current
2019-06-16 rinpatchMerge 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 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template blob | commitdiff | raw | diff to current
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into... blob | commitdiff | raw | diff to current
2019-05-01 Alex SMerging with develop blob | commitdiff | raw | diff to current
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification... blob | commitdiff | raw | diff to current
2019-04-30 Roman ChvanikovMerge develop blob | commitdiff | raw | diff to current
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account blob | commitdiff | raw | diff to current
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into... blob | commitdiff | raw | diff to current
2019-04-22 kaniiniMerge branch 'get-cached-everywhere' into 'develop' blob | commitdiff | raw | diff to current
2019-04-22 EgorUse `User.get_cached*` everywhere blob | commitdiff | raw | diff to current
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination... blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop' blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop' blob | commitdiff | raw | diff to current
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ... blob | commitdiff | raw | diff to current
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'remove-user-activities' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 Alex SMerge develop into feature/770-add-emoji-tags blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'features/mastoapi/2.6.0-force-login-optio... blob | commitdiff | raw | diff to current
2019-04-02 lambdaMerge branch 'get_by_id' into 'develop' blob | commitdiff | raw | diff to current
2019-04-02 Egor Kislitsynchange `Repo.get(User, id)` => `User.get_by_id(id)` blob | commitdiff | raw | diff to current
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... blob | commitdiff | raw | diff to current
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I... blob | commitdiff | raw | diff to current
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop' blob | commitdiff | raw | diff to current
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into... blob | commitdiff | raw | diff to current
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop' blob | commitdiff | raw | diff to current
2019-03-13 lambdaMerge 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 KonouMerge branch 'bugfix/delete-activity-audience' of git... blob | commitdiff | raw | diff to current
2019-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into... blob | commitdiff | raw | diff to current
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin... blob | commitdiff | raw | diff to current
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline... blob | commitdiff | raw | diff to current
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop' blob | commitdiff | raw | diff to current
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical... blob | commitdiff | raw | diff to current
2019-03-01 lambdaMerge branch 'feature/cowboy2' into 'develop' blob | commitdiff | raw | diff to current
2019-02-28 William Pitcockmastodon websocket: return errors using ok, not stop blob | commitdiff | raw | diff to current
2019-02-28 William Pitcockmastodon websocket: bring back infinity timeout blob | commitdiff | raw | diff to current
2019-02-28 William Pitcockmastodon websocket: use pattern match to get query... blob | commitdiff | raw | diff to current
2019-02-28 William Pitcockmastodon 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 VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into... blob | commitdiff | raw | diff to current
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting blob | commitdiff | raw | diff to current
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... blob | commitdiff | raw | diff to current
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10... blob | commitdiff | raw | diff to current
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop' blob | commitdiff | raw | diff to current
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop' blob | commitdiff | raw | diff to current
2019-02-09 Haelwenn (lanodan... de-group alias/es blob | commitdiff | raw | diff to current
2019-02-09 Haelwenn (lanodan... Make credo happy blob | commitdiff | raw | diff to current
2019-01-13 rinpatchResolve merge conflict blob | commitdiff | raw | diff to current
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop' blob | commitdiff | raw | diff to current
2019-01-03 rinpatchMerge branch 'captcha' into 'develop' blob | commitdiff | raw | diff to current
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop' blob | commitdiff | raw | diff to current
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ... blob | commitdiff | raw | diff to current
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop' blob | commitdiff | raw | diff to current
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop' blob | commitdiff | raw | diff to current
2018-12-31 William Pitcockupdate copyright years to 2019 blob | commitdiff | raw | diff to current
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into... blob | commitdiff | raw | diff to current
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet... blob | commitdiff | raw | diff to current
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop' blob | commitdiff | raw | diff to current
2018-12-23 William Pitcockadd license boilerplate to pleroma core blob | commitdiff | raw | diff to current
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html... blob | commitdiff | raw | diff to current
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop' blob | commitdiff | raw | diff to current
2018-12-18 raenoMerge branch 'develop' into oembed_provider blob | commitdiff | raw | diff to current
2018-12-17 lambdaMerge branch '459_fix_user_profile_crash' into 'develop' blob | commitdiff | raw | diff to current
2018-12-17 lambdaMerge branch 'captcha' into 'develop' blob | commitdiff | raw | diff to current
2018-12-17 lambdaMerge branch 'fix-tags' into 'develop' blob | commitdiff | raw | diff to current
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop' blob | commitdiff | raw | diff to current
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git