merge develop
[akkoma] / mix.lock
2019-04-30 Roman ChvanikovMerge develop
2019-04-27 kaniiniMerge branch 'feature/bbcode' into 'develop'
2019-04-26 William Pitcockmix: add bbcode dependency
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-20 Roman ChvanikovDigest emails
2019-04-19 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 Roman ChvanikovResolve conflicts
2019-04-17 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-16 kaniiniMerge branch 'feature/788-separate-email-addresses...
2019-04-16 kaniiniMerge branch 'fix/remote-follow-auth' into 'develop'
2019-04-16 HaelwennMerge branch 'bugfix/relax-spam-protection' into 'develop'
2019-04-16 kaniiniMerge branch 'patch-2' into 'develop'
2019-04-16 rinpatchMerge branch 'deps/bump-exdoc' into 'develop'
2019-04-16 rinpatchBump ex_doc
2019-04-14 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-13 HaelwennMerge branch 'docs/changelog' into 'develop'
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-12 HaelwennMerge branch 'improve-formatter' into 'develop'
2019-04-12 EgorRevert "simplify mentions escape"
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 lainMerge branch 'features/mastoapi/2.6.0-conversations...
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 lambdaMerge branch 'feature/770-add-emoji-tags' into 'develop'
2019-04-08 Egor KislitsynMerge branch 'develop' into use-jobs-in-webpush
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-08 lambdaMerge branch 'develop' into 'improve_upgrade_user_from_...
2019-04-06 feldMerge branch 'fix/deactivated-user-error' into 'develop'
2019-04-06 feldMerge branch 'fix/failed-legacy-test' into 'develop'
2019-04-06 feldMerge branch 'feature/prometheus' into 'develop'
2019-04-06 Mark FelderPin recon dependency to 2.4.0
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-04 Mark FelderMerge branch 'develop' into feature/prometheus
2019-04-04 feldMerge branch 'feature/quack' into 'develop'
2019-04-04 feldAdd ability to ship logs to a Slack channel
2019-04-04 hrefAdd recon
2019-04-04 lambdaMerge branch 'fix/add-oauth-token-indexes' into 'develop'
2019-04-03 lambdaMerge branch 'feature/robotstxt' into 'develop'
2019-04-03 lambdaMerge branch 'update-autolinker' into 'develop'
2019-04-03 Egor KislitsynUpdate `auto_linker` dependency
2019-04-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop'
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-31 lainBBS: Some more functionality.
2019-03-29 lambdaMerge branch 'pleroma_job_queue' into 'develop'
2019-03-29 EgorReplace Pleroma.Jobs with `pleroma_job_queue`
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-27 Ivan Tashkinov[#923] OAuth consumer improvements, fixes, refactoring.
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-22 lambdaMerge branch 'safe-mentions' into 'develop'
2019-03-22 kaniiniMerge branch 'safe-mentions' into 'develop'
2019-03-21 rinpatchMerge branch 'ecto-3-migration' into 'develop'
2019-03-20 Ivan Tashkinov[#923] Support for multiple OAuth consumer strategies.
2019-03-20 rinpatchEcto 3.0.5 migration
2019-03-18 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-11 Ivan TashkinovSign in via Twitter (WIP).
2019-03-08 kaniiniMerge branch 'fix-tlsv1.3' into 'develop'
2019-03-07 rinpatchMerge branch 'bugfix/delete-activity-audience' into...
2019-03-06 kaniiniMerge branch 'chore/merge-search-into-list-users' into...
2019-03-06 HaelwennMerge branch 'fix/escape-reserved-chars-in-filenames...
2019-03-05 rinpatchMerge branch 'add-admin-to-node-info' into 'develop'
2019-03-04 kaniiniMerge branch 'feature/add-status-text-to-notifications...
2019-03-04 Maxim FilippovAdd status text to notifications (mentions and reposts)
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin...
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline...
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop'
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical...
2019-03-01 lambdaMerge branch 'feature/cowboy2' into 'develop'
2019-02-28 William Pitcockmix: update dependencies for cowboy 2.0
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-26 kaniiniMerge branch 'auto_linker' into 'develop'
2019-02-26 EgorAutoLinker
2019-02-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-02-23 kaniiniMerge branch 'add-apache-cache-config' into 'develop'
next