developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solved desktop conflict during cherry pick

Browse Source
This commit is contained in:
harrybomrah authored and Matt K. Fu committed 2013-06-18 15:24:41 +08:00
1 parent 1a7a199504
commit 7e6433f71c
9 files changed
+198 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/routes.rb
+2 -1
View File
@@ -200,7 +200,7 @@ Orbit::Application.routes.draw do
match "/desktop/compatibility" => "desktop#compatibility"
match "desktop" => "desktop#index"
match "/desktop/desktop" => "desktop#desktop"
match '/desktop/desktop'=>'desktop#desktop'
match '/desktop/appactivation'=>'desktop#appactivation'
match '/desktop/app_manager'=>'desktop#app_manager'
match '/desktop/allsections'=>'desktop#allsections'
match '/desktop/settings'=>'desktop#settings'
@@ -211,6 +211,7 @@ Orbit::Application.routes.draw do
match '/desktop/themes/'=>'desktop#themes'
match '/desktop/sections/'=>'desktop#sections'
match '/desktop/getapplist/'=>'desktop#getapplist'
match '/desktop/getapplistforManager/'=>'desktop#getapplistforManager'
match '/desktop/newpositions/'=>'desktop#newpositions'
match '/desktop/connections/'=>'desktop#connections'
match '/desktop/widget_layout' => 'desktop#widget_layout'