Merge branch 'develop' into feature/addressable-lists
[akkoma] / lib / pleroma / web / chat_channel.ex
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
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'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] Remove parentesis on argument-less functions
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.AliasOrder
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-12 lainIgnore incoming empty chat messages.
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-08 lambdaMerge branch 'fix/config-disable-chat' into 'develop'
2018-02-08 Calv CollinsMerge branch 'develop' of https://git.pleroma.social...
2018-02-08 Roger BraunFix compile errors on 1.4.5
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-12-08 lambdaMerge branch 'postgresetup' into 'develop'
2017-12-05 hrefMerge remote-tracking branch 'upstream/develop' into...
2017-12-05 lambdaMerge branch 'feature/chat' into 'develop'
2017-12-05 Roger BraunMerge remote-tracking branch 'origin/develop' into...
2017-12-05 Roger BraunDon't save user in socket, just save the name.
2017-12-05 Roger BraunAdd basic channel state.
2017-12-04 Lain IwakuraBasic backend chat.