Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

2 files changed, 35 insertions, 0 deletions

diff --git a/db/migrate/20130116133243_create_call_routes.rb b/db/migrate/20130116133243_create_call_routes.rb
new file mode 100644
index 0000000..c2d3f45
--- /dev/null
+++ b/db/migrate/20130116133243_create_call_routes.rb
@@ -0,0 +1,16 @@
+class CreateCallRoutes < ActiveRecord::Migration
+  def self.up
+    create_table :call_routes do |t|
+      t.string :table
+      t.string :name
+      t.string :endpoint_type
+      t.integer :endpoint_id
+      t.integer :position
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :call_routes
+  end
+end
diff --git a/db/migrate/20130116133433_create_route_elements.rb b/db/migrate/20130116133433_create_route_elements.rb
new file mode 100644
index 0000000..72f6894
--- /dev/null
+++ b/db/migrate/20130116133433_create_route_elements.rb
@@ -0,0 +1,19 @@
+class CreateRouteElements < ActiveRecord::Migration
+  def self.up
+    create_table :route_elements do |t|
+      t.integer :call_route_id
+      t.string :var_in
+      t.string :var_out
+      t.string :pattern
+      t.string :replacement
+      t.string :action
+      t.boolean :mandatory
+      t.integer :position
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :route_elements
+  end
+end