Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
[akkoma] / mix.lock
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'
2018-11-10 Haelwenn (lanodan... Add ex_doc
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-04 kaniiniMerge branch 'tests-for-emtpy-content' into 'develop'
2018-11-03 kaniiniMerge branch 'feature/cors-again' into 'develop'
2018-11-03 lainAdd CORSPlug to make web-based OAuth easier.
2018-10-07 kaniiniMerge branch 'patch-2' into 'develop'
2018-10-05 kaniiniMerge branch 'revert-d31bbb1c' into 'develop'
2018-10-05 William PitcockRevert "Merge branch 'revert-a26d5e6b' into 'develop'"
2018-09-08 lambdaMerge branch 'moonman/pleroma-sha512-crypt' into 'develop'
2018-09-07 kaniiniMerge branch 'add-secure-and-samesite-cookie-flags...
2018-09-05 lainUpdate Mix.lock
2018-09-03 kaniiniMerge branch 'feature/mastodon_api_2.4.x' into 'develop'
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-31 lambdaMerge branch 'revert-a26d5e6b' into 'develop'
2018-08-31 lambdaRevert "Merge branch 'feature/rich-text' into 'develop'"
2018-08-31 kaniiniMerge branch 'feature/rich-text' into 'develop'
2018-08-31 William Pitcockcommon api: add support for formatting messages outside...
2018-08-28 kaniiniMerge branch 'feature/s3' into 'develop'
2018-08-27 William Pitcockmix: add ex_aws and ex_aws_s3 dependencies
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-20 ealMerge branch 'fix/redirect-on-user-fetch' into 'develop'
2018-08-18 kaniiniMerge branch 'update/pleroma-fe-20180818' into 'develop'
2018-08-16 kaniiniMerge branch 'bugfix/undocumented-mastodon-app-api...
2018-08-16 kaniiniMerge branch 'bugfix/mix-lock' into 'develop'
2018-08-16 William Pitcockupdate mix.lock
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-08-16 kaniiniMerge branch 'develop' into 'patch-2'
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-16 kaniiniMerge branch 'fix/normalize-file-extension' into 'develop'
2018-08-15 lambdaMerge branch 'feature/suggestions-api-with-third-party...
2018-08-12 lambdaMerge branch 'feature/invites' into 'develop'
2018-07-25 lambdaMerge branch 'feature/filter_exif' into 'develop'
2018-07-20 Tristan MahéMerge remote-tracking branch 'upstream/develop' into...
next