diff --git a/app/mailers/diaspora_devise_mailer.rb b/app/mailers/diaspora_devise_mailer.rb index 39a34b2bf..3ec4cbb63 100644 --- a/app/mailers/diaspora_devise_mailer.rb +++ b/app/mailers/diaspora_devise_mailer.rb @@ -1,4 +1,4 @@ -class DiasporaDeviseMailer < DeviseMailer +class DiasporaDeviseMailer < Devise::Mailer include NotifierHelper default :from => AppConfig[:smtp_sender_address] diff --git a/app/views/devise/mailer/invitation_instructions.erb b/app/views/devise/mailer/invitation_instructions.erb index fb443a746..9e27bba76 100644 --- a/app/views/devise/mailer/invitation_instructions.erb +++ b/app/views/devise/mailer/invitation_instructions.erb @@ -17,9 +17,6 @@ - - - Finally - it's here.
@@ -31,11 +28,6 @@ - - - - - The social network you have been waiting for has arrived. Revamped, more secure, and more fun, DIASPORA* is ready to help you share and explore the web in a whole new way.
diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 2d8d49ece..3017cda28 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -41,12 +41,11 @@ var ContactEdit = { processSuccess: function(element, evt, data) { element.removeClass('loading') - + element.parent().parent().html('sent!'); if (data.url != undefined) { window.location = data.url; } else { element.toggleClass("selected"); - Diaspora.widgets.flashes.render({'success':true, 'notice':data.message}); } },