danielvincent 385e1673ab Merge branch 'master' into getting-started ...

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml

2010-10-26 16:50:57 -07:00

..

environments

trying the mailer_condig

2010-10-07 16:54:38 -07:00

initializers

Fix for build breakage

2010-10-25 21:38:53 -07:00

locales

settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update

2010-10-26 16:02:53 -07:00

sprinkle

Add or later to license notice

2010-10-07 16:25:34 -07:00

app_config.yml.example

Polishing up after git mess...

2010-10-20 22:05:42 +02:00

application.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

boot.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

cucumber.yml

Add cucumber and run the generator

2010-09-26 11:35:50 -04:00

deploy_config.yml

deploys back to master

2010-10-25 19:33:23 -07:00

deploy.rb

dont show service if you dont have the keys for it. also, update deploy script

2010-10-25 22:06:53 -07:00

environment.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

oauth_keys.yml.example

remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"

2010-10-25 17:50:04 -07:00

routes.rb

Merge branch 'master' into getting-started

2010-10-26 16:50:57 -07:00

selenium.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00

server.sh

Add a configuration file

2010-10-19 08:26:43 +02:00

thin.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00