Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / views /
2021-11-15 lainMerge branch 'block-behavior' into 'develop'
2021-11-15 lainMerge branch 'instance-deletion' into 'develop'
2021-11-15 lainMerge branch 'fix-object-deletion-timeout' into 'develop'
2021-11-15 lainMerge branch 'userfeed-fe-fallback' into 'develop'
2021-10-06 HaelwennMerge branch 'bugfix/crypt-pragma' into 'develop'
2021-10-06 HaelwennMerge branch 'from/develop/tusooa/add-remove-emails...
2021-09-13 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-09-07 HaelwennMerge branch 'remove/mastofe' into 'develop'
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
2021-08-06 Sean KingMerge branch 'develop' of git.pleroma.social:pleroma...
2021-08-04 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-18 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-17 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-10 Sean KingMerge develop branch upstream
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-27 sadpostermerge
2021-06-07 feldMerge branch 'pleromapi' into 'develop'
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 Sean KingFix more build errors
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop'
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop'
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-18 Alex GleasonSwitch to aliasing `Router.Helpers` instead of importing
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-16 Sean KingRemove MastoFE-related backend code and frontend pieces
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop'
2021-02-06 rinpatchMerge branch 'feat/allow_alt_text_search_config' into...
2021-02-04 feldMerge branch 'fix/configdb-error' into 'develop'
2021-02-03 feldMerge branch 'develop' into 'fix/2412-filters'
2021-02-03 feldMerge branch 'fix/2449-scheduled-poll-bug' into 'develop'
2021-02-03 feldMerge branch 'feature/2438-users-posts-total-count...
2021-02-03 rinpatchMerge branch 'feat/openapi-spec-export' into 'develop'
2021-02-03 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-02 feldMerge branch 'a1batross-develop-patch-62810' into ...
2021-02-02 feldMerge branch 'email-stub-in-verify-credentials' into...
2021-01-28 Ivan TashkinovEmail-like field in /api/v1/accounts/verify_credentials...
2021-01-23 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2021-01-06 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-29 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-20 rinpatchMerge branch 'bugfix/mastofe-install-script' into ...
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop'
2020-12-09 lainMerge branch 'auth-improvements' into 'develop'
2020-12-09 lainMerge branch 'stream-follow-updates' into 'develop'
2020-12-02 Egor KislitsynDocument follow relationship updates and cleanup
2020-12-01 Egor KislitsynStream follow updates
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-01 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
next