flaburgan
46223a2dfc
Don't truncate notification emails anymore, close #4342
2015-01-10 22:10:11 +01:00
Jonne Haß
e70e48d6ca
some refactoring regarding the law of demeter
2012-09-23 19:33:19 +02:00
Steven Hancock
56db268613
Use markerb for emails
...
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB
This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
2012-05-07 19:41:30 -07:00
Maxwell Salzberg
5868ff06f1
remove user inspect at the top of invites. Thx Blaine [ci skip]
2012-03-17 16:56:20 -07:00
Jonne Haß
7e7de439f8
fix untranslatable stuff from the invite refactor
2012-03-17 13:52:46 +01:00
Maxwell Salzberg
319b3c4d3b
fixed rspec tests, more fit and finish around how the invite code works,
...
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b
small updates, and it looks like we are mostly working
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Jonne Hass
a892ea41eb
refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471
2011-12-06 13:08:21 +01:00
Dan Hansen
814eb7b426
RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address.
...
Check against the raw headers of the mail as @mail.from excludes the display name
Extract shared logic between notifier methods
2011-10-09 22:19:50 -05:00
Dan Hansen
8c15ca2a4b
PMs and comments contain author name in "From" header
...
refactor notifier
2011-10-04 23:48:28 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337
reshares now have notifications, slight refactor of the notification helper
2011-08-25 17:16:09 -07:00
danielgrippi
08f12ee348
fixed the 'a post' bug in notification emails
2011-08-11 14:40:45 -07:00
danielgrippi
1e7a2f327b
use post_message in all mailer html views
2011-08-10 15:31:39 -07:00
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
39da9302a1
Revert "deleted unused file". sorry!! :(
...
This reverts commit a6f2f82c5e
2011-07-15 22:33:55 -07:00
danielgrippi
a6f2f82c5e
deleted unused file
2011-07-15 21:44:12 -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
danielgrippi
2e15b6a61e
Likes in comments, cache counter disabled for now.
2011-07-11 15:00:48 -07:00
Raphael Sofaer
97ca10ddda
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
2011-07-10 20:06:31 -07:00
Raphael Sofaer
a1a53b34e9
Link to post in text email for comment_on_post. Fix 1144
2011-06-26 20:09:21 -07:00
Sebastian
ea85daadc4
Added UsersController#confirm_email with route and some specs
2011-06-01 16:26:54 +02: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
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
Raphael Sofaer
cb49d1f4ea
fixed the formatting on emails
2011-05-11 17:02:05 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -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
fa27fa2d29
make one translation absolute to attempt to fix 1.9 build
2011-03-30 10:39:40 -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
MrZYX
0d1133cd51
fixed some translations
...
do not escape html in private_message text only email
2011-03-09 15:33:46 +01:00
danielgrippi
dda477410d
use conversations_url() with a param in private message emails
2011-03-08 22:11:34 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
zhitomirskiyi
c252cfa025
added the email notification, the notification is not persisted, fixed the receive callback spec
2011-03-08 18:24:56 -08:00
MrZYX
5f841b9add
do not escape html in text only emails
2011-03-08 20:45:02 +01:00
zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
MrZYX
fbaf9d6e84
fixed translation in request accepted mail
2011-02-14 21:50:38 +01:00
zhitomirskiyi
6441977a7c
added the post author name to the text also commented email
2011-02-11 10:31:20 -08:00
maxwell
a27b1b2648
make the mention in html email not a link
2011-02-10 14:43:23 -08:00
zhitomirskiyi
717d2e09c9
fixed the translation in the email
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d905021252
comment emails have text
2011-02-03 13:07:26 -08:00
zhitomirskiyi
bc058332d3
commented on post email now includes the comment
2011-02-01 12:54:05 -08:00
Raphael
767e58bf94
Correct email picture url
2011-01-28 11:43:15 -08:00
Raphael
d1b1db25ed
That needed to be formatted differently
2011-01-25 10:09:15 -08:00
Raphael
d288160c7f
Add link to text request_accepted email
2011-01-25 10:07:45 -08:00
zhitomirskiyi
249b62445f
added the files
2011-01-06 16:51:34 -08:00
zhitomirskiyi
82852db5ec
added the files this time
2011-01-05 15:04:28 -08:00
zhitomirskiyi
c7ecab4933
the new request email links back to the pod
2011-01-05 09:35:47 -08:00
