projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / test / pleroma / web / feed /
2021-06-04 Sean KingFix merge conflicts with upstream tree | commitdiff
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop' tree | commitdiff
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop' tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop' tree | commitdiff
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop' tree | commitdiff
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0 tree | commitdiff
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable' tree | commitdiff
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop' tree | commitdiff
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop' tree | commitdiff
2021-02-03 feldMerge branch 'develop' into 'fix/2412-filters' tree | commitdiff
2021-02-03 feldMerge branch 'feature/2438-users-posts-total-count... tree | commitdiff
2021-02-03 rinpatchMerge branch 'feat/openapi-spec-export' into 'develop' tree | commitdiff
2021-02-02 feldMerge branch 'develop' into 'fix/2411-mutes-api' tree | commitdiff
2021-01-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-27 lainMerge branch 'chore/tests-use-clear_config' into 'develop' tree | commitdiff
2021-01-26 Mark FelderConvert tests to all use clear_config instead of Plerom... tree | commitdiff
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop' tree | commitdiff
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2 tree | commitdiff
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop' tree | commitdiff
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop' tree | commitdiff
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021 tree | commitdiff
2021-01-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop' tree | commitdiff
2021-01-07 lainMerge branch 'cleanup/unused-proxy-opts' into 'develop' tree | commitdiff
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop' tree | commitdiff
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2021-01-04 lainObject: Rework how Object.normalize works tree | commitdiff
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-26 lainMerge branch 'cachex-test' into 'develop' tree | commitdiff
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1 tree | commitdiff
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ... tree | commitdiff
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-16 lainMerge branch 'fix/2336-mastoapi-ws-posts-dropping'... tree | commitdiff
2020-12-14 Alexander StrizhakovFix for dropping posts/notifs in WS when mix task is... tree | commitdiff
2020-11-21 feldMerge branch 'libmagic' into 'develop' tree | commitdiff
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-11-17 lainMerge branch 'chores/note-handling-move' into 'develop' tree | commitdiff
2020-11-17 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-17 rinpatchImport stable commits into develop after releasing... tree | commitdiff
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-11-13 lainMerge branch 'fixes_2034_reports_should_send_a_notifica... tree | commitdiff
2020-11-13 lainMerge branch 'docs/otp-tuning' into 'develop' tree | commitdiff
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable' tree | commitdiff
2020-11-11 Egor KislitsynMerge branch 'develop' into frontend-admin-api tree | commitdiff
2020-11-11 feldMerge branch 'feature/2222-config-descriptions-for... tree | commitdiff
2020-11-10 lainMerge branch '2260-wrong-report-link' into 'develop' tree | commitdiff
2020-11-10 lainMerge branch 'fix/html-title-load' into 'develop' tree | commitdiff
2020-11-10 lainMerge branch 'fix/2291-atom-feed-escape' into 'develop' tree | commitdiff
2020-11-10 Alexander Strizhakovescaping summary and other fields in xml templates tree | commitdiff
2020-11-05 feldMerge branch 'ostatus-controller-no-auth-check-on-non... tree | commitdiff
2020-11-04 lainMerge branch 'default-mrf' into 'develop' tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop' tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-03 lainMerge branch 'chores/pleroma-favicon-logo' into 'develop' tree | commitdiff
2020-11-02 lainMerge branch 'bugfix/poll_replies_count' into 'develop' tree | commitdiff
2020-11-02 minibikiniMerge branch 'develop' into 'frontend-admin-api' tree | commitdiff
2020-10-30 Egor KislitsynMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop' tree | commitdiff
2020-10-29 feldMerge branch 'fix/frontend-cli-docs' into 'develop' tree | commitdiff
2020-10-29 feldMerge branch 'issue/2137-user-filters-admin-fe' into... tree | commitdiff
2020-10-29 Egor KislitsynMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2020-10-29 Egor KislitsynMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2020-10-28 feldMerge branch 'ostatus-controller-no-auth-check-on-non... tree | commitdiff
2020-10-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop' tree | commitdiff
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export tree | commitdiff
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic tree | commitdiff
2020-10-13 Mark FelderMerge branch 'develop' into chore/elixir-1.11 tree | commitdiff
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field tree | commitdiff
2020-10-13 Mark FelderMerge branch 'develop' into refactor/discoverable_user_... tree | commitdiff
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into... tree | commitdiff
2020-10-13 Alexander Strizhakovother files consistency tree | commitdiff
2020-10-13 Alexander Strizhakovtests consistency tree | commitdiff
Fork of https://akkoma.dev/AkkomaGang/akkoma.git