diff --git a/CHANGELOG.md b/CHANGELOG.md index 298cf0d89e..6f18b0c4a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog -## 1.1.3-dev +## 1.1.3 (2016-1-20) + +* Enhancements + * [phoenix.gen] Support `--binary-id` option when generating scaffold + * [phoenix.new] Don't include Ecto gettext translations if `--no-ecto` is passed + +* JavaScript client bug fixes + * Ensure exports variable does not leak + * Fix `setTimeout` scoping issue for Babel ## 1.1.2 (2015-1-8) diff --git a/installer/lib/phoenix_new.ex b/installer/lib/phoenix_new.ex index 3df97eae2f..9c089e2ac9 100644 --- a/installer/lib/phoenix_new.ex +++ b/installer/lib/phoenix_new.ex @@ -460,8 +460,8 @@ defmodule Mix.Tasks.Phoenix.New do :crypto.strong_rand_bytes(length) |> Base.encode64 |> binary_part(0, length) end - # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.2"}] - defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}] + defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.3"}] + # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}] defp phoenix_dep(path), do: ~s[{:phoenix, path: #{inspect path}, override: true}] defp phoenix_static_path("deps/phoenix"), do: "deps/phoenix" diff --git a/installer/mix.exs b/installer/mix.exs index ab2215597d..22ac19ecba 100644 --- a/installer/mix.exs +++ b/installer/mix.exs @@ -3,7 +3,7 @@ defmodule Phoenix.New.Mixfile do def project do [app: :phoenix_new, - version: "1.1.2", + version: "1.1.3", elixir: "~> 1.0-dev"] end diff --git a/mix.exs b/mix.exs index 2a855e1bfa..4a6e4e8fb4 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Phoenix.Mixfile do use Mix.Project - @version "1.1.3-dev" + @version "1.1.3" def project do [app: :phoenix, diff --git a/package.json b/package.json index b6b09a65f5..e44e621b6c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phoenix", - "version": "1.1.2", + "version": "1.1.3", "main": "./priv/static/phoenix.js", "repository": { },