Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a40543e15c
|
a user now has the option to disable reshare email notifications
|
2011-08-25 17:16:09 -07:00 |
|
Ilya Zhitomirskiy
|
6cda0bf9ea
|
Revert "added a podwide email preference"
This reverts commit 60c0a9839b.
|
2011-05-18 10:38:45 -07:00 |
|
Ilya Zhitomirskiy
|
60c0a9839b
|
added a podwide email preference
|
2011-05-17 18:19:47 -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
|
ebb17ff70c
|
few cucumber steps failing. wip.
|
2011-05-11 11:08:30 -07:00 |
|
danielgrippi
|
2e5b5e1efe
|
request notification emails -> started sharing notification emails
|
2011-04-06 13:21:15 -07:00 |
|
maxwell
|
b14ac9606f
|
fix typo, puts in a test, and made the emails types a constant in UserPreferences
|
2011-03-14 12:21:30 -07:00 |
|
maxwell
|
adbd23ec50
|
more tests for mailing. the bug was i think we have to restart the resque workers
|
2011-03-14 11:32:59 -07:00 |
|
maxwell
|
e9a843b095
|
email prefs are now saved. need more tests and use it in user#mail
|
2011-03-11 15:42:53 -08:00 |
|