danielgrippi 60a60733df Merge branch 'master' into follow ...

Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb

2011-05-12 15:49:51 -07:00

..

step_definitions

Merge branch 'master' into follow

2011-05-12 15:49:51 -07:00

support

Red feature for infinite scroll after changing aspects

2011-04-26 17:28:42 -07:00

uri-tests

Backing out sub-uri changes

2011-01-09 18:29:43 -08:00

accepts_invitation.feature

edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.

2011-04-05 18:53:10 -07:00

change_password.feature

Logout: still not a word.

2011-04-29 19:44:57 -07:00

closes_account.feature

tagging profiles complete

2011-03-15 13:21:36 -07:00

comments.feature

likes cucumber, rspec green

2011-05-11 11:08:30 -07:00

connects_users.feature

fixed cucumber with an exception of one step. added dropdowns to tag pages

2011-05-12 14:11:52 -07:00

disconnects_users.feature

Merge branch 'master' into follow

2011-05-12 15:49:51 -07:00

download_photos.feature

make the photo downloaders wip to save mrzyx some emails untill we work it out

2011-03-17 18:40:26 -07:00

edits_profile.feature

cleaned up craziness in users and likes routing, fixed #961

2011-03-24 03:02:14 +01:00

embedder.feature

Theory: embedder.feature breaks CI because it assumes the browser can show video.

2011-04-29 19:53:27 -07:00

infinite_scroll.feature

Fix broken sorting by activity

2011-05-07 00:50:26 -04:00

logs_in_and_out.feature

Logout: still not a word.

2011-04-29 19:44:57 -07:00

manages_aspects.feature

dropdown in ContactsController#sharing now works

2011-05-11 15:47:13 -07:00

notifications.feature

Merge branch 'master' into follow

2011-05-12 15:49:51 -07:00

posts.feature

Cukes for posting a photo with and without text

2011-05-06 16:46:45 -04:00

saved_state.feature

Revert "popstate now in aspect-filters. back button now actually works on aspect/index."

2011-03-31 01:30:02 -07:00

signs_up.feature

add some limits for conversation#new

2011-03-29 15:19:14 -07:00

tags.feature

fixed cucumber with an exception of one step. added dropdowns to tag pages

2011-05-12 14:11:52 -07:00