changed properties and the name of hyperchad to selectricity

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
old mode 100644 (file)
new mode 100755 (executable)
index 69addb1..7159e1f
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -36,7 +36,7 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time

-  # config.active_record.default_timezone = :utc
+  config.active_record.default_timezone = :utc

   
   # See Rails::Configuration for more options
 end
   
   # See Rails::Configuration for more options
 end


@@ -50,7 +50,7 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

-MAIL_CONFIG = { :from => 'HyperChad <info@hyperchad.media.mit.edu>'} 
+MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 

 
 # Include your application configuration below
 require 'uniq_token'
 
 # Include your application configuration below
 require 'uniq_token'


@@ -78,10 +78,15 @@ end
 module LoginEngine
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]
 module LoginEngine
   config :salt, "voothingboat"
   config :email_from, MAIL_CONFIG[:from]

+  config :admin_email, MAIL_CONFIG[:from]
+  config :app_name, 'Selectricity'
+  config :changeable_fields, []
+  config :use_email_notification, true
+  config :confirm_account, false

 end
 end

-

 Engines.start :login
 
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"
 Engines.start :login
 
 # action mailer configuration
 ActionMailer::Base.delivery_method = :sendmail
 ActionMailer::Base.default_charset = "utf-8"

+