merge develop
[akkoma] / mix.lock
2019-07-12 Roman Chvanikovmerge develop
2019-07-10 kaniiniMerge branch 'localization' into 'develop'
2019-07-10 Egor KislitsynUpdate `gettext` dependency
2019-07-10 kaniiniMerge branch 'feature/disable_send_emails' into 'develop'
2019-07-10 Maksim[#1062] added option to disable send email
2019-07-10 kaniiniMerge branch 'release/listener' into 'develop'
2019-07-10 kaniiniMerge branch 'tests/mrf_policy' into 'develop'
2019-07-10 Maksimtests MRF filters
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream...
2019-07-09 Roman ChvanikovMerge develop
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query...
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop'
2019-07-09 kaniiniMerge branch 'test-coverage' into 'develop'
2019-07-09 Alexander Strizhakovreverse proxy tests
2019-06-30 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-22 rinpatchMerge branch 'develop' into release-docs
2019-06-22 rinpatchMerge branch 'mix_sem_ver_version_fix' into 'develop'
2019-06-21 kaniiniMerge branch 'chore/update-bbcode' into 'develop'
2019-06-21 William Pitcockmix: update bbcode dependency to v0.1.1
2019-06-21 kaniiniMerge branch 'oauth_secure_redirect' into 'develop'
2019-06-20 rinpatchMerge branch 'feature/release-update-script' into ...
2019-06-19 rinpatchMerge branch 'begone-the-dot-hack' into 'develop'
2019-06-19 lainMerge branch 'fix/rich-media-hashtags-again' into ...
2019-06-18 lainMerge branch 'deps/update-auto-linker' into 'develop'
2019-06-18 rinpatchDeps: Update auto_linker
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 lainMerge branch 'update/phoenix-and-plug' into 'develop'
2019-06-15 Mark FelderUpdate Phoenix to 1.4.8
2019-06-13 rinpatchMerge branch 'develop' into feature/ci-release-build
2019-06-12 lainMerge branch 'release-config-import' into 'develop'
2019-06-12 lainMerge branch 'chore/tagpolicy_docs' into 'develop'
2019-06-12 lainMerge branch 'update_auto_linker' into 'develop'
2019-06-12 Egor KislitsynUpdate `auto_linker` dependency
2019-06-11 lainMerge branch 'feature/rate-limiter' into 'develop'
2019-06-11 lainMerge branch 'update-plug' into 'develop'
2019-06-11 Egor KislitsynUpdate `plug` dependency
2019-06-11 Egor KislitsynUpdate `ex_rated` dependency
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-04 Roman ChvanikovFix conflict
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-01 rinpatchResolve merge conflicts
2019-05-29 Roman ChvanikovMerge develop
2019-05-23 Sachin Joshifix merge conflict
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop'
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'bring-ecto-back-to-mainline' into 'develop'
2019-05-22 lainMix: Bring ecto-sql back to mainline.
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lambdaMerge branch 'ecto_sql_update' into 'develop'
2019-05-17 lambdaMerge branch 'update-tzdata' into 'develop'
2019-05-17 lainDependencies: Update tzdata.
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lainDependencies: Update ecto sql once more.
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-15 kaniiniMerge branch 'fix/public-option-not-working' into ...
2019-05-15 lambdaMerge branch 'chore/extricate-http-signatures' into...
2019-05-15 kaniiniMerge branch 'prevent-public-answers' into 'develop'
2019-05-15 lambdaMerge branch 'cleanup' into 'develop'
2019-05-15 lambdaMerge branch 'ci/coverage' into 'develop'
2019-05-15 feldExcoveralls for code coverage
2019-05-15 lainDependencies: Update Ecto SQL.
2019-05-15 lainSearch: Add optional rum indexing / searching.
2019-05-14 William Pitcockswitch to pleroma/http_signatures library
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop'
2019-05-13 kaniiniMerge branch 'features/mastoapi/2.7.0-registration...
2019-05-13 Alexander Strizhakovdifferences_in_mastoapi_responses.md: fullname & bio...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-11 kaniiniMerge branch 'fix/ostatus-activity-representer-depends...
2019-05-11 Roman ChvanikovMerge develop
2019-05-11 HaelwennMerge branch 'feature/adminfe' into 'develop'
2019-05-11 feldInitial bundle of basic AdminFE
2019-05-08 Roman ChvanikovMerge develop
2019-05-07 kaniiniMerge branch 'docs/MRF-modules' into 'develop'
2019-05-07 lambdaMerge branch 'conversations_three' into 'develop'
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-06 lambdaMerge branch 'feature/bbs' into 'develop'
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-03 rinpatchMerge branch 'fix/embeded-relationship-in-follows'...
2019-05-03 rinpatchMerge branch 'fix-search-speed' into 'develop'
2019-05-03 lainSearch: Add fts index on objects table.
2019-05-03 lainStreamer: Stream out Conversations/Participations.
2019-05-02 lambdaMerge branch 'iss-849' into 'develop'
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 lambdaMerge branch 'bugfix/web-notification-special-char...
2019-05-01 lambdaMerge branch 'harmonize_return_types_in_user_module...
2019-05-01 rinpatchMerge branch 'docs/fix-config.md' into 'develop'
2019-05-01 rinpatchMerge branch 'update_auto_linker' into 'develop'
2019-05-01 Egor KislitsynUpdate `auto_linker`
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
next