Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma] / lib / pleroma / config.ex
2019-12-10 lainMerge branch 'develop' into '1427-oauth-admin-scopes'
2019-12-10 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-12-05 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-05 Ivan Tashkinov[#1427] Reworked admin scopes support.
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-01 HaelwennMerge branch 'fix/docs-dry-run' into 'develop'
2019-07-01 HaelwennMerge branch 'ci-improvements' into 'develop'
2019-06-30 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-06-30 Ivan Tashkinov[#161] Merge remote-tracking branch 'remotes/upstream...
2019-06-30 rinpatchMerge branch 'issues/1026' into 'develop'
2019-06-30 Maksim[#1026] Filter.AnonymizeFilename added ability to retai...
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-29 Roman ChvanikovMerge develop
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 lambdaMerge branch 'refactor/use-job-queue-everywhere' into...
2019-05-14 kaniiniMerge branch 'fix/pleroma-config-get-when-value-is...
2019-05-13 Aaron TinioFix Pleroma.Config.get!/1 raising an error when value...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Alex SMerging with develop
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 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-05 Ivan Tashkinov[#923] OAuth consumer mode refactoring, new tests,...
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-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 lambdaMerge branch 'config-delete' into 'develop'
2018-11-30 hrefPleroma.Config.delete/1
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-08 lambdaMerge branch 'small-jsonld-refactor' into 'develop'
2018-11-07 kaniiniMerge branch 'feature/qvitter-notifications-dismiss...
2018-11-07 kaniiniMerge branch 'runtime-config' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 hrefRuntime configuration
2018-11-06 kaniiniMerge branch 'unify-mastodon-oauth' into 'develop'
2018-11-06 kaniiniMerge branch 'runtime-router' into 'develop'
2018-11-06 lambdaMerge branch 'remove-config-agent' into 'develop'
2018-11-06 hrefSmall wrapper module around Application.get_env/put_env
2018-11-06 hrefGet rid of Pleroma.Config in favor of Application
2018-11-01 kaniiniMerge branch 'feature/relay-tests' into 'develop'
2018-11-01 lainAdd basic configuration management module.