Merge branch 'lukas/picked_ques' into development

config/environments/production.rb

@@ -59,4 +59,17 @@ Orbit::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = {
+    :enable_starttls_auto => true,
+    :address => "smtp.gmail.com",
+    :port => '587',
+    :domain => "smtp.gmail.com",
+    :authentication => "plain",
+    :user_name => "redmine@rulingcom.com",
+    :password => "rulingredmine"
+  }
+
 end

config/routes.rb

@@ -288,11 +288,11 @@ Orbit::Application.routes.draw do
 
 
   match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
-    !request.query_string.include?("inner=true")
+    !request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
   }
 
   match '/panel/:app_name/front_end/:app_action' => 'pages#index_from_link', :constraints => lambda { |request|
-    !request.query_string.include?("inner=true")
+    !request.query_string.include?("inner=true") && !request.query_string.include?("standalone=true")
   }
 
   match '/share/:model/:id' => 'application#render_share'