diaspora/config
zhitomirskiyi 4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial"
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
2011-02-08 16:40:33 -08:00
..
deploy Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
environments Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
initializers correct requires 2011-01-19 14:30:34 -08:00
locales Revert "refactored local person person friend finder functionality to use the partial" 2011-02-08 16:40:33 -08:00
app_config.yml.example remove mongodb from app_config.yml.example 2011-01-29 15:38:26 +01:00
application.rb Use a fake to not allocate an AR model for every reference to a person 2011-01-24 15:13:52 -08:00
assets.yml remove some js assets from mobile 2011-02-06 23:09:04 -08:00
boot.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
cucumber.yml suburi cucumber test. 2010-12-29 10:31:25 +01:00
database.yml.example replaced user with username in the database.yml example 2011-01-20 15:19:14 +01:00
deploy.rb use capture and captures to detect thins in /service 2011-01-31 15:28:43 -08:00
deploy_config.yml.example Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
environment.rb fixed typo for default_language at environment.rb 2011-01-16 16:14:24 -05:00
langcodes_alias_map.yml updated locales 2010-12-24 15:41:54 +01:00
languages.yml fixed #781 2011-01-01 23:55:12 +01:00
oauth_keys.yml.example changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :) 2010-12-03 16:04:37 +01:00
redis.yml Revert "Revert redis merge to fix bugs on master" 2010-12-02 15:33:26 -08:00
routes.rb resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
selenium.yml Add or later to license notice 2010-10-07 16:25:34 -07:00
server.sh Revert "Extended sub-uri support." for now.... 2010-12-20 18:12:12 -08:00
thin.yml Add or later to license notice 2010-10-07 16:25:34 -07:00