Commit graph

6 commits

Author SHA1 Message Date
Raphael Sofaer
7aefe37de8 Reenable notifications feature, don't use javascript in step definitions if you can avoid it? 2011-07-04 15:38:15 -07:00
danielgrippi
1cd3ef4971 comment out a notifications feature for now that seems to break cucumber. what it's testing is kind of already asserted in the previous feature. thoughts? 2011-07-04 01:58:47 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
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
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Dan Goldenberg
2567a9441e Added notification.feature 2011-01-31 18:42:34 -08:00