Maxwell Salzberg
2d6a69cdc8
fix for 500s in liked emails for reshares and activity streams photos
2011-08-10 10:25:43 -07:00
Raphael Sofaer
9797e04957
Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
...
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
danielgrippi
c4b715f3ff
fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews
2011-07-15 21:22:29 -07:00
Sebastian
37ccbce153
Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update
2011-06-01 16:26:53 +02: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
a036a8035f
add a plaintext layout for emails, and include a link to change your email settings in the emails
2011-03-22 12:26:38 -07:00
zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
MrZYX
3c089506ff
localize emails
2011-02-12 17:35:12 +01:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
Raphael
dde8fd65e5
Fix build
2011-01-28 12:18:56 -08:00
Raphael
767e58bf94
Correct email picture url
2011-01-28 11:43:15 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
zhitomirskiyi
3fae950905
also commented notification and sending ids into resque so that it works
2011-01-06 15:56:03 -08:00
zhitomirskiyi
67be774b7a
setting the comment
2011-01-05 15:35:40 -08:00
zhitomirskiyi
7254db5cbc
Revert "Revert "added comment on post mail method""
...
This reverts commit c9b3066599
2011-01-05 14:59:15 -08:00
zhitomirskiyi
c9b3066599
Revert "added comment on post mail method"
...
This reverts commit c00226238b
2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b
added comment on post mail method
2011-01-05 14:55:17 -08:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
maxwell
d24be269f2
small refactor of admin mail. don't call deliver in the method
2010-12-14 17:36:26 -08:00
danielvincent
b1c0facfe6
initiating a request now just creates a pending contact instead of persisting a request
2010-12-14 17:11:43 -08:00
maxwell
d9f25473d2
fix a bug with the notifier and attachment
2010-12-13 14:28:21 -08:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
MrZYX
6a4351378b
fixed bug in the mailer that caused a invalid To: header in the mail
2010-12-05 20:48:18 +01:00
MrZYX
a605ab482b
made sender address in notifier.rb configurable. This fixes #657
2010-12-03 15:49:34 +01:00
Raphael
5791ffba79
Add administrative mail method
2010-12-01 11:20:10 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Raphael
38a2ea5199
Remove auto-friending in db:reset for dev servers
2010-11-24 17:55:51 -05:00
Raphael
93ebbbb65f
put some logging in the mailer
2010-11-24 17:13:28 -05:00
MrZYX
9ceb3e2fd1
found some still untranslatable strings in helpers and stuff
2010-11-12 06:07:36 +01:00
maxwell
cc92f61583
mailer queue now works
2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04
more testing
2010-11-05 11:46:43 -07:00
maxwell
53b25728ce
yay for typo
2010-11-05 11:46:43 -07:00
maxwell
4154cec28a
made mailer query based on ids, rather than making them serialize ruby objects
2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7
inital commit for mailqueue
2010-11-05 11:46:43 -07:00
danielvincent
a31c22adb3
mailer doesn't break everything anymore. attachments are also inlined.
2010-11-02 17:59:50 -07:00
danielvincent
a995d250f1
added white text on grey asset to mailer
2010-11-02 17:19:49 -07:00
maxwell
c6fbcd28f7
stubbing out the hub publish method
2010-10-29 12:09:10 -07:00
maxwell
096a0308e1
update attachment with emails
2010-10-22 17:12:28 -07:00
ilya
9a217d1fa8
MS IZ request acceptance email
2010-10-22 11:55:50 -07:00
maxwell
20a5ec863f
small bugfixes for the mailer
2010-10-22 00:49:01 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
ilya
80cd4761f3
started the new invitation email
2010-10-22 00:49:01 -07:00
