Merge branch 'features/add-credo-to-ci' into 'develop'
[akkoma] / lib / pleroma / web / channels / user_socket.ex
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] write large numbers with underscore separation
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-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch '459_fix_user_profile_crash' into 'develop'
2018-12-17 lambdaMerge branch 'captcha' into 'develop'
2018-12-17 lambdaMerge branch 'fix-tags' into 'develop'
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop'
2018-12-17 lambdaMerge branch 'phoenix14' into 'develop'
2018-12-16 hrefUpgrade to Phoenix 1.4
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-22 kaniiniMerge branch 'feature/admin-api' into 'develop'
2018-11-21 kaniiniMerge branch 'feature/improve-version' into 'develop'
2018-11-20 kaniiniMerge branch 'runtime-fixes' into 'develop'
2018-11-19 hrefVarious runtime configuration fixes
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-06 lambdaMerge branch 'feld-warnings' into 'develop'
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderClean up unused aliases and imports
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 lambdaMerge branch 'develop' into 'develop'
2018-02-08 lambdaMerge branch 'fix/config-disable-chat' into 'develop'
2018-02-03 ealAdd config option for enabling/disabling chat.
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-04 Lain IwakuraBasic backend chat.
2017-03-17 Roger BraunPhoenix skeleton