Commit 2ce7a1e1 authored by augier's avatar augier Committed by Jonne Haß

Mobile subdomain

closes #6354
parent f627919f
......@@ -27,6 +27,7 @@
* Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
* Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)
* New /m route to force the mobile view [#6354](https://github.com/diaspora/diaspora/pull/6354)
# 0.5.2.0
......
......@@ -30,4 +30,10 @@ class HomeController < ApplicationController
redirect_to :back
end
def force_mobile
session[:mobile_view] = true
redirect_to stream_path
end
end
......@@ -224,6 +224,7 @@ Diaspora::Application.routes.draw do
# Mobile site
get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile'
get "/m", to: "home#force_mobile", as: "force_mobile"
# Help
get 'help' => 'help#faq', :as => 'help'
......
......@@ -10,3 +10,10 @@ Feature: Visit the landing page of the pod
When I toggle the mobile view
And I go to the root page
Then I should see "Welcome, friend"
When I am on the root page
Then I should see "Welcome, friend"
When I go to the mobile path
Then I should see "LOG IN"
When I go to the mobile path
Then I should see "LOG IN"
......@@ -5,6 +5,8 @@ module NavigationHelpers
person_photos_path(@me.person)
when /^the home(?: )?page$/
stream_path
when /^the mobile path$/
force_mobile_path
when /^step (\d)$/
if $1.to_i == 1
getting_started_path
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment