Monday release almost ready

pull/196/head
connor rigby 2016-11-07 14:12:28 -08:00
parent 63b0166252
commit 704f3b58be
3 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,7 @@ defmodule Device do
when is_integer(id)
and( is_integer(paid) or is_nil(paid) )
and is_bitstring(name)
and is_bitstring(wcu)
and(is_bitstring(wcu) or is_nil(wcu))
do
%Device{
id: id,

View File

@ -77,8 +77,8 @@ defmodule Fw.Mixfile do
{:hulaaki, github: "ConnorRigby/hulaaki"},
{:mustache, "~> 0.0.2"},
{:timex, "~> 3.0"},
# {:farmbot_auth, github: "Farmbot/farmbot_auth"},
{:farmbot_auth, path: "../farmbot_auth"}
{:farmbot_auth, github: "Farmbot/farmbot_auth"},
# {:farmbot_auth, path: "../farmbot_auth"}
]
end

View File

@ -11,8 +11,8 @@
"exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
"exrm": {:hex, :exrm, "1.0.8", "5aa8990cdfe300282828b02cefdc339e235f7916388ce99f9a1f926a9271a45d", [:mix], [{:relx, "~> 3.5", [hex: :relx, optional: false]}]},
"fake_nerves": {:git, "https://github.com/ConnorRigby/fake_nerves.git", "9bbf56f3e538580f9e7e09d08d77021b907f2a44", []},
"farmbot_auth": {:git, "https://github.com/Farmbot/farmbot_auth.git", "6e7af662b2b2dcab988ff1c11b50b856ae3f4a70", []},
"farmbot_configurator": {:git, "https://github.com/Farmbot/farmbot_configurator.git", "9116c77df972f54769bc3b3e31ec255233048817", []},
"farmbot_auth": {:git, "https://github.com/Farmbot/farmbot_auth.git", "97f003ee4f241c65a6f4f835e9db733c84c7f477", []},
"farmbot_configurator": {:git, "https://github.com/Farmbot/farmbot_configurator.git", "1fb13c087859659dcf189b814c2bc4c4c3ea5b53", []},
"gen_stage": {:hex, :gen_stage, "0.8.0", "a76e3f0530f86fae8b8a1021c06527b1ec171cf4c0bdfecd8d5ad0376d1205af", [:mix], []},
"getopt": {:hex, :getopt, "0.8.2", "b17556db683000ba50370b16c0619df1337e7af7ecbf7d64fbf8d1d6bce3109b", [:rebar], []},
"gettext": {:hex, :gettext, "0.12.1", "c0624f52763469ef7a3674919ae28b8286d88195b90fa1516180f31bbbd26d14", [:mix], []},