Resolve conflicts
[akkoma] / CHANGELOG.md
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release/1.0' into 'develop'
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-28 lainBUMP OF CHICKEN
2019-06-27 kaniiniMerge branch 'fix/syslog-tag' into 'develop'
2019-06-27 Mark FelderAdd changelog entry for syslog tag change
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-26 kaniiniMerge branch 'refactoring/fix_render_view' into 'develop'
2019-06-26 kaniiniMerge branch 'feature/configurable-pack-extensions...
2019-06-26 rinpatchMerge branch 'issues/1016' into 'develop'
2019-06-26 Maksim Pechnikovupdate changelog
2019-06-26 rinpatchMake default pack extensions configurable and default...
2019-06-26 MaksimApply suggestion to CHANGELOG.md
2019-06-26 Maksim Pechnikovupdate changelog
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop'
2019-06-23 rinpatchBind to 127.0.0.1 instead of 0.0.0.0 by default
2019-06-22 rinpatchMerge branch 'mix_sem_ver_version_fix' into 'develop'
2019-06-21 rinpatchMerge branch 'develop' into release-docs
2019-06-21 kaniiniMerge branch 'feature/mrf-anti-link-spam' into 'develop'
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-20 William Pitcockdocs: better description for mrf anti link spam
2019-06-19 William Pitcockimplement anti link spam MRF
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-19 lainMerge branch 'update-frontend-c4fcdc71' into 'develop'
2019-06-18 lainMerge branch 'deps/update-auto-linker' into 'develop'
2019-06-18 lainMerge branch 'fix/mastoapi-sanitize-display-name' into...
2019-06-18 rinpatchMastodon API: Sanitize display names
2019-06-16 rinpatchMerge branch 'fix/991-version-generation' into 'develop'
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-15 rinpatchMerge branch 'feature/add-chat-token-to-masto-api'...
2019-06-15 lainApply suggestion to CHANGELOG.md
2019-06-15 lainChangelog: Document chat token.
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 kaniiniMerge branch 'feature/905-dynamic-configuration-in...
2019-06-14 Alexander Strizhakovit is changed in compile time
2019-06-14 lainMastodon API: Document changes.
2019-06-12 lainMerge branch 'release-config-import' into 'develop'
2019-06-12 lainMerge branch 'chore/tagpolicy_docs' into 'develop'
2019-06-11 kaniiniMerge branch 'improve-local-content-limit' into 'develop'
2019-06-11 Egor KislitsynAdd option to restrict all users to local content
2019-06-11 lainMerge branch 'feature/rate-limiter' into 'develop'
2019-06-11 Egor KislitsynUpdate CHANGELOG
2019-06-11 kaniiniMerge branch 'change-containment-default' into 'develop'
2019-06-11 kaniiniMerge branch 'preload-changes' into 'develop'
2019-06-10 lainMerge branch 'feature/releases' into 'develop'
2019-06-09 rinpatchAdd a changelog entry for releases
2019-06-09 rinpatchMerge branch 'develop' into feature/releases
2019-06-08 lainMerge branch 'prod-loglevel-warn' into 'develop'
2019-06-08 rinpatchSet default loglevel to `warn` in prod
2019-06-07 lainConfiguration: Skip thread containment by default
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-06 rinpatchMerge branch 'improve-search' into 'develop'
2019-06-06 Egor[#943] Make the unauthenticated users limitation optional
2019-06-05 kaniiniMerge branch 'bugfix/377-stuck-follow-request' into...
2019-06-05 lainUtils: Use update_follow_state_for_all when appropriate.
2019-06-05 kaniiniMerge branch 'explicit-addressing' into 'develop'
2019-06-04 Roman ChvanikovFix conflict
2019-06-04 HaelwennMerge branch 'remove-tag-warning' into 'develop'
2019-06-04 HaelwennMerge branch 'bugfix/956-activity-id-nil-conversations...
2019-06-04 lainMerge branch 'issue/941' into 'develop'
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941
2019-06-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-06-04 lainDocs: Add Explicit addressing to Readme and changelog.
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941
2019-06-04 kaniiniMerge branch 'feature/mrf-subchain' into 'develop'
2019-06-04 kaniiniMerge branch 'generic-fe-settings' into 'develop'
2019-06-04 kaniiniMerge branch 'ueberauth_config_extension' into 'develop'
2019-06-04 William Pitcockupdate CHANGELOG for mrf_subchain
2019-06-04 Roman ChvanikovUpdate changelog
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Maksim Pechnikovupdated changelog
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-03 rinpatchMerge branch 'feature/polls-2-electric-boogalo' into...
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric...
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric...
2019-06-03 rinpatchAdd a changelog entry for polls
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 lainSetting Store: Document in changelog.
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-31 rinpatchMastodon API: Fix lists leaking private posts
2019-05-30 feldMerge branch 'fix/ogp-missing-data' into 'develop'
2019-05-30 Sergey SuprunenkoReplace missing non-nullable Card attributes with empty...
2019-05-29 Roman ChvanikovMerge develop
2019-05-26 lambdaMerge branch 'refactor/die-httpoison-die' into 'develop'
2019-05-26 kaniiniMerge branch 'fix/mrf-simple' into 'develop'
2019-05-26 William Pitcockmrf: simple policy: fix matching imported activitypub...
2019-05-22 kaniiniMerge branch 'feature/mrf-user-filter' into 'develop'
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop'
2019-05-22 William Pitcockupdate documentation for the new MRF features [no-ci]
2019-05-22 lambdaMerge branch 'issue/699' into 'develop'
2019-05-22 Maksim[#699] add worker to clean expired oauth tokens
2019-05-22 lambdaUpdate CHANGELOG.md
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
next