Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
[akkoma] / mix.lock
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
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'
2019-02-23 kaniiniMerge branch 'card-handling' into 'develop'
2019-02-23 kaniiniMerge branch 'fix/meck' into 'develop'
2019-02-22 Mark FelderUpate meck to fix tests on MacOS
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-21 lambdaMerge branch 'bugfix/httpsig-sign-date' into 'develop'
2019-02-21 William Pitcockmix: add timex dependency
2019-02-20 lambdaMerge branch '468_oauth2_scopes' into 'develop'
2019-02-20 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-13 Ivan Tashkinov[#468] User UI for OAuth permissions restriction. Stand...
2019-01-13 rinpatchResolve merge conflict
2019-01-09 lambdaMerge branch 'scarlett/pleroma-summary-html-api' into...
2019-01-08 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-01-07 kaniiniMerge branch 'features/syslog_logger' into 'develop'
2019-01-06 Haelwenn (lanodan... Install ex_syslogger
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-05 scarlettMerge branch 'emoji-in-summary' into 'develop'
2019-01-05 cascodeMerge branch 'develop' of git.pleroma.social:cascode...
2019-01-04 kaniiniMerge branch 'fix/html-cache-content-collision' into...
2019-01-04 kaniiniMerge branch 'feature/rich-media' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-03 rinpatchMerge branch 'fix-chat' into 'develop'
2019-01-02 rinpatchMerge branch 'fix/reserve-media-username' into 'develop'
2019-01-01 Maxim FilippovAdd OGP parser
2019-01-01 kaniiniMerge branch 'pool-usage' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-01-01 lainUpdate Tesla and Hackney.
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-19 raenoMerge branch 'develop' into oembed_provider
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch '459_fix_user_profile_crash' into 'develop'
2018-12-17 lambdaMerge branch 'captcha' into 'develop'
2018-12-17 lambdaMerge branch 'fix-tags' into 'develop'
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop'
2018-12-17 lambdaMerge branch 'phoenix14' into 'develop'
2018-12-17 hrefSwitch to phoenixframework/phoenix as the needed change...
2018-12-17 hrefIntegration tests for mastodon websocket
2018-12-16 hrefUpgrade to Phoenix 1.4
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 raenoScrub html from activity.content or user.bio for opengr...
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 Maksim Pechnikovfix markdown formatting
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-12 Ivan Tashkinov[#114] SMTP deps and config.
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Rin ToshakaMerge develop
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop'
2018-12-06 kaniiniMerge branch 'correct-and-improve-http-options' into...
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop'
2018-12-06 kaniiniMerge branch 'feature/compat/push-subscriptions' into...
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-06 Egor KislitsynAdd web push support
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-04 kaniiniMerge branch 'optional-retry-queue' into 'develop'
2018-12-04 kaniiniMerge branch 'feature/integration_tesla' into 'develop'
2018-12-04 Maksim Pechnikovinit tesla and updated the http requests in Pleroma...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-27 kaniiniMerge branch 'revert-02e43d44' into 'develop'
2018-11-27 kaniiniRevert "Merge branch 'chore/mix-lock-update' into ...
2018-11-27 kaniiniMerge branch 'chore/mix-lock-update' into 'develop'
2018-11-27 Maxim FilippovAdd ex_doc & makeup_elixir to mix.lock
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 lambdaMerge branch 'bugfix/json-ld-object-sanitization' into...
2018-11-10 kaniiniMerge branch 'feature/documentation' into 'develop'
next