Merge branch 'fix-object-deletion-timeout' into 'develop'
[akkoma] / lib / pleroma / config / loader.ex
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
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-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-12 HaelwennMerge branch 'features/ingestion-page' into 'develop'
2021-07-10 Sean KingMerge develop branch upstream
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-10 feldMerge branch 'fix/twittercard-video-dimensions' into...
2021-06-08 feldMerge branch 'cycles-config-loader-redux' into 'develop'
2021-06-08 Alex GleasonIgnore runtime deps in Pleroma.Config.Loader with Modul...
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 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 HaelwennMerge branch 'features/validators-note' into 'develop'
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 feldMerge branch 'cycles-views' into 'develop'
2021-05-29 feldMerge branch 'cycles-html' into 'develop'
2021-05-29 feldMerge branch 'cycles-gun' into 'develop'
2021-05-29 feldMerge branch 'cycles-config' into 'develop'
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonConfig: use runtime deps instead of module attributes
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
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
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-10 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-09 Mark FelderMerge branch 'develop' into fix/csp-for-captcha
2020-07-09 lainMerge branch '1723-token-fixes' into 'develop'
2020-07-09 lainMerge branch 'bugfix/status-deletion' into 'develop'
2020-07-07 HaelwennMerge branch 'feature/1392-support-irreversible-filters...
2020-07-07 HaelwennMerge branch 'description-limits' into 'develop'
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 rinpatchMerge branch '1915-dont-filter-announce-notifications...
2020-07-06 lainMerge branch 'filter-tesla-config' into 'develop'
2020-07-06 Alexander Strizhakovdon't save tesla settings into db
2020-06-20 lainMerge branch 'bugfix/mix.exs-version-dot-git-less'...
2020-06-18 Maksim Pechnikovrevert 'database' option to rejected keys
2020-06-17 Maksim Pechnikovfixed migration the settings to DB
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-24 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-23 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-23 rinpatchMerge branch 'bugfix/null-scheduled-at' into 'develop'
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-22 HaelwennMerge branch 'fix/follow-and-blocks-import' into 'develop'
2020-04-22 HaelwennMerge branch 'feature/voters-count' into 'develop'
2020-04-22 HaelwennMerge branch 'worker-messages' into 'develop'
2020-04-22 lainMerge branch 'fix/1689-fix-migrate-to-db' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-17 Alexander Strizhakovdon't restart postgrex
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-15 rinpatchMerge branch 'release/2.0.1' into 'stable'
2020-03-15 rinpatchMerge branch 'fix/1610-release-compilation-config-fix...
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-13 rinpatchMerge branch 'revert/cache-control' into 'develop'
2020-03-12 feldMerge branch 'exclude-posts-visible-to-admin' into...
2020-03-12 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-12 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-11 rinpatchMerge branch 'docs/new_user' into 'develop'
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 rinpatchMerge branch 'fix/1610-release-compilation-config-fix...
2020-03-11 Alexander Strizhakovcompile fix
2020-03-11 Alexander Strizhakovmerging release default config on app start
next