github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to the default site configuration (multi_sites disabled)

Browse Source
This commit is contained in:
did 2011-07-05 18:41:14 +02:00
parent ca0921d2f3
commit 01b0cde69b
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/initializers/locomotive.rb
View File

@ -7,16 +7,16 @@ Locomotive.configure do |config|
# your own domain name (ex: locomotivehosting.com). # your own domain name (ex: locomotivehosting.com).
# #
# Ex: # Ex:
config.multi_sites do |multi_sites| # config.multi_sites do |multi_sites|
# each new website you add will have a default entry based on a subdomain # # each new website you add will have a default entry based on a subdomain
# and the multi_site_domain value (ex: website_1.locomotivehosting.com). # # and the multi_site_domain value (ex: website_1.locomotivehosting.com).
multi_sites.domain = 'example.com' #'myhostingplatform.com' # multi_sites.domain = 'example.com' #'myhostingplatform.com'
#
# define the reserved subdomains # # define the reserved subdomains
# Ex: # # Ex:
multi_sites.reserved_subdomains = %w(www admin email blog webmail mail support help site sites) # multi_sites.reserved_subdomains = %w(www admin email blog webmail mail support help site sites)
end # end
# config.multi_sites = false config.multi_sites = false
# configure the hosting target for the production environment. Locomotive can be installed in: # configure the hosting target for the production environment. Locomotive can be installed in:
# - your own server # - your own server

4
doc/TODO
View File

@ -65,9 +65,9 @@ x export site
x rake task to import a remote template x rake task to import a remote template
x MERGE x MERGE
x remove withelist for assets since we've got now roles x remove withelist for assets since we've got now roles
- admin role is not correctly set when creating a new website x admin role is not correctly set when creating a new website
- test and/or convert existing templates (the 2 of the themes section)
- the required star for file field is not shown - the required star for file field is not shown
- test and/or convert existing templates (the 2 of the themes section)
- tooltip to explain the difference between 1.) Admin 2.) Author 3.) Designer? - tooltip to explain the difference between 1.) Admin 2.) Author 3.) Designer?
- overide sort for contents - overide sort for contents

1
doc/changelogs/20110704.txt
View File

@ -24,4 +24,5 @@ Here is a pretty exhaustive list of what the BIG MERGE includes:
- better hints for the theme asset new/edit action - better hints for the theme asset new/edit action
- slight modifications on forms: separator between fields, text shadow, error message redesigned, ...etc - slight modifications on forms: separator between fields, text shadow, error message redesigned, ...etc
- quick link to edit directly a model from the submenu - quick link to edit directly a model from the submenu
- new sites picker (if the multi_sites mode is enabled and correctly set up)
- a lot of internal refactoring as well as a ton of bug corrections - a lot of internal refactoring as well as a ton of bug corrections