Release 1.1.3

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)
 

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"

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
 

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,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "./priv/static/phoenix.js",
   "repository": {
   },