Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
[akkoma] / lib / pleroma / web / channels /
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
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 Maksim PechnikovMerge branch 'develop' into issue/1276
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-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/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 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
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'
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.
next