9cd08bac67
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink in public when using sub-uri. Various clean-up, removing thin and socket port settings from server.sh (these are now taken from pod_uri and socket_port). Basic functionality when setting a sub_uri like http://example.org/diaspora now seems OK. Closes .http://joindiaspora.com/issues/737, and partially http://joindiaspora.com/issues/391. Ports are yet to be defined and handled in this context. Conflicts: app/views/layouts/application.html.haml config/routes.rb
46 lines
749 B
Text
46 lines
749 B
Text
#trademark sillyness
|
|
app/views/home/_show.html.haml
|
|
app/views/home/_show.mobile.haml
|
|
public/images/ball_small.png
|
|
public/images/ball.png
|
|
# Configuration files
|
|
config/app_config.yml
|
|
config/fb_config.yml
|
|
config/oauth_keys.yml
|
|
config/initializers/secret_token.rb
|
|
config/redis.conf
|
|
.bundle
|
|
vendor/bundle/*
|
|
|
|
# Generated files
|
|
log/*
|
|
public/stylesheets/application.css
|
|
public/stylesheets/sessions.css
|
|
public/stylesheets/ui.css
|
|
public/stylesheets/mobile.css
|
|
public/diaspora
|
|
spec/fixtures/users.yaml
|
|
|
|
# Uploded files and local files
|
|
public/uploads/*
|
|
public/assets/*
|
|
public/source.tar*
|
|
tmp/**/*
|
|
tmp/*
|
|
db/*.sqlite3
|
|
.redcar
|
|
|
|
# Temporary files of every sort
|
|
.DS_Store
|
|
.idea
|
|
.rvmrc
|
|
.stgit*
|
|
*.swap
|
|
*.swo
|
|
*.swp
|
|
*~
|
|
bin/*
|
|
nbproject
|
|
patches-*
|
|
capybara-*.html
|
|
dump.rdb
|