Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu

This commit is contained in:
Harry Bomrah 2015-04-22 22:59:42 +08:00
commit 143d8009c5
1 changed files with 2 additions and 0 deletions

View File

@ -11,7 +11,9 @@ Orbit::Application.routes.draw do
get "/pages/edit_view" => "pages#edit_view" get "/pages/edit_view" => "pages#edit_view"
get "/pages/preview" => "pages#preview" get "/pages/preview" => "pages#preview"
get "/pages/get_categories" => "pages#get_categories" get "/pages/get_categories" => "pages#get_categories"
get "/pages/get_member_attributes" => 'pages#get_member_attributes'
post "/pages/update_item_position" => "pages#update_item_position" post "/pages/update_item_position" => "pages#update_item_position"
post "/pages/save_member_frontend_fields" => 'pages#save_member_frontend_fields'
get "/page_parts/getwidgets" => "page_parts#getwidgets" get "/page_parts/getwidgets" => "page_parts#getwidgets"
get "/page_parts/info" => "page_parts#info" get "/page_parts/info" => "page_parts#info"