Merge branch 'stable' into release/2.0.0
[akkoma] / lib / pleroma / config /
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 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-03-02 lainMerge branch 'prepared-statements-settings' into 'develop'
2020-03-02 HaelwennMerge branch 'feature/1482-activity_pub_transactions...
2020-03-02 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2020-03-02 Haelwenn (lanodan... Bump copyright years of files changed after 2020-01-07
2020-02-20 lainMerge branch 'require-signature' into 'develop'
2020-02-20 lainMerge branch 'features/remote-follow-userpage-redirect...
2020-02-20 lainMerge branch 'docs_updating' into 'develop'
2020-02-20 lainMerge branch 'feature/new-registrations-digest' into...
2020-02-18 feldMerge branch 'develop' into 'fix/mrf-sample-doc'
2020-02-18 feldMerge branch 'fix/mrf-docs' into 'develop'
2020-02-18 feldMerge branch 'chore/config-descriptions' into 'develop'
2020-02-18 lainMerge branch 'fix/status-view/expires_at' into 'develop'
2020-02-18 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-18 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-18 lainMerge branch 'chore/standardize-mrf-behavior' into...
2020-02-18 lainMerge branch 'need-reboot-flag' into 'develop'
2020-02-11 Egor KislitsynMerge branch 'develop' into feature/new-registrations...
2020-02-11 lainMerge branch 'docs/kyclos' into 'develop'
2020-02-10 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-02-08 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-02-08 Alexander Strizhakovneed_reboot flag
2020-02-07 HaelwennMerge branch 'cancel-follow-request' into 'develop'
2020-02-06 feldMerge branch 'mastoapi-non-html-strings' into 'develop'
2020-02-06 rinpatchMerge branch 'develop' into fix/dymamic-docs
2020-02-05 rinpatchMerge branch 'fix/unpinnable-polls' into 'develop'
2020-02-05 feldMerge branch 'remove-linker-scheme-option' into 'develop'
2020-02-05 rinpatchMerge branch 'feature/restart-pleroma-from-outside...
2020-02-05 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-01-30 rinpatchMerge branch 'develop' into fix/disable-rate-limiter...
2020-01-28 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-01-28 feldMerge branch 'fix/attachments-cleanup' into 'develop'
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2020-01-28 lainMerge branch 'fix/attachments-cleanup' into 'develop'
2020-01-27 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-01-26 Mark FelderMerge branch 'develop' into issue/1280
2020-01-25 Alexander Strizhakovrestarting pleroma from outside application
2020-01-24 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2020-01-24 feldMerge branch 'fix/better-descriptions-for-email-fields...
2020-01-24 rinpatchMerge branch 'fix/1532-fix-for-migration-fe-setting...
2020-01-24 rinpatchMerge branch 'emoji-reaction-sanity-check' into 'develop'
2020-01-24 Alexander Strizhakovfix for non existing atom
2020-01-24 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2020-01-24 feldMerge branch 'fix_for_migrate_to_db_test' into 'develop'
2020-01-23 feldMerge branch 'truncate_config_table_on_migrate_to_db...
2020-01-23 Alexander Strizhakovparsing Swoosh modules
2020-01-23 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2020-01-23 HaelwennMerge branch 'emoji-notifications' into 'develop'
2020-01-22 Mark FelderMerge branch 'feature/new-registrations-digest' of...
2020-01-22 Mark FelderMerge branch 'develop' into feature/new-registrations...
2020-01-22 Mark FelderMerge branch 'develop' into features/remote-follow...
2020-01-22 rinpatchMerge branch 'no-error-404' into 'develop'
2020-01-22 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-01-22 feldMerge branch 'admin-be' into 'develop'
2020-01-22 Alexander Strizhakovsupport for updating env after settings deletion
2020-01-22 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-21 Alexander Strizhakovsome refactor and tests
2020-01-21 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-21 Alexander Strizhakovfix for db key
2020-01-20 Alexander Strizhakovmerge fix
2020-01-18 Alexander Strizhakovreleases support
2020-01-18 Alexander Strizhakovfull update for some subkeys
2020-01-17 Alexander Strizhakovreturn db key on update requests
2020-01-17 Alexander Strizhakovsome clean up
2020-01-17 Alexander Strizhakovfix for config loader
2020-01-17 Alexander Strizhakovsaving to DB only added by user settings
2020-01-16 Alexander Strizhakovrenaming
2020-01-15 Alexander Strizhakovlittle cleanup
2020-01-14 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-14 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-11 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-10 Alexander Strizhakovdynamic_configuration renaming
2020-01-10 Alexanderfix for endpoints after env update
2020-01-10 Alex Sconfig editing through database
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 rinpatchMerge branch 'misc-otp-issues' into 'develop'
2019-08-14 stwfuse default child_specs
2019-07-20 rinpatchResolve merge conflicts
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-16 rinpatchMerge branch 'bugfix/poll-id-as-string' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop'
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name
2019-07-15 kaniiniMerge branch 'update-tzdata' into 'develop'
2019-07-15 kaniiniMerge branch 'admin-configure-atom-keys' into 'develop'
2019-07-15 Alex Satom keys with leading :
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
next