X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=mix.exs;h=25711bc26b6bf482d49cc45524c12845d2e3af12;hb=2a96283efbd46c017cf9e15ef4fda3188e5e5bca;hp=70b5e4bd6ff006ffc8960c1b0f6cebc078d3dce9;hpb=54e7087ab412a488f8ad7286aef89d313e5e7b14;p=akkoma

diff --git a/mix.exs b/mix.exs
index 70b5e4bd6..25711bc26 100644
--- a/mix.exs
+++ b/mix.exs
@@ -23,11 +23,14 @@ defmodule Pleroma.Mixfile do
         logo: "priv/static/static/logo.png",
         extras: [
           "README.md",
-          "docs/config.md",
-          "docs/Pleroma-API.md",
           "docs/Admin-API.md",
           "docs/Clients.md",
-          "docs/Differences-in-MastodonAPI-Responses.md"
+          "docs/config.md",
+          "docs/Custom-Emoji.md",
+          "docs/Differences-in-MastodonAPI-Responses.md",
+          "docs/Message-Rewrite-Facility-configuration.md",
+          "docs/Pleroma-API.md",
+          "docs/static_dir.md"
         ],
         main: "readme",
         output: "priv/static/doc"
@@ -41,7 +44,7 @@ defmodule Pleroma.Mixfile do
   def application do
     [
       mod: {Pleroma.Application, []},
-      extra_applications: [:logger, :runtime_tools, :comeonin],
+      extra_applications: [:logger, :runtime_tools, :comeonin, :ueberauth_twitter],
       included_applications: [:ex_syslogger]
     ]
   end
@@ -69,7 +72,8 @@ defmodule Pleroma.Mixfile do
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
-      {:httpoison, "~> 1.2.0"},
+      {:httpoison, "~> 1.2.0", override: true},
+      {:poison, "~> 3.0", override: true},
       {:tesla, "~> 1.2"},
       {:jason, "~> 1.0"},
       {:mogrify, "~> 0.6.1"},
@@ -90,6 +94,10 @@ defmodule Pleroma.Mixfile do
       {:floki, "~> 0.20.0"},
       {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
       {:timex, "~> 3.5"},
+      {:oauth, github: "tim/erlang-oauth"},
+      # {:oauth2, "~> 0.8", override: true},
+      {:ueberauth, "~> 0.4"},
+      {:ueberauth_twitter, "~> 0.2"},
       {:auto_linker,
        git: "https://git.pleroma.social/pleroma/auto_linker.git",
        ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}