Merge with new_blog

This commit is contained in:
chris2tof committed 2011-10-18 11:36:01 +08:00
1 parent 2e86d8081f
commit 64c68fcdeb
80 files changed
+906 -79

No files matched your search

+1 -1
View File
@@ -60,5 +60,5 @@ module PrototypeR4
config.assets.enabled = true
end
end
Orbit_Apps = []
VALID_LOCALES = ["en", "zh_tw"]
+3 -1
View File
@@ -7,7 +7,9 @@ PrototypeR4::Application.routes.draw do
match '/site/public_key', :to => CentralServerExchangeApp
match '/site/update', :to => GithubApp
match '/purchase/design', :to => CentralServerExchangeApp
match "/panel/:app_name/frontend/:action" => redirect {|params| "/panel/#{params[:app_name]}/#{params[:action]}" }
# routes for admin
namespace :admin do
resources :assets