8 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	4a6b5274bc	feat(invite): fixes for org invite enhancement story, #2353	2015-08-17 10:55:52 +02:00
Matt Toback	0651f134e4	Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go.	2015-08-14 15:21:51 -04:00
Matt Toback	60eec49e95	Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner	2015-08-13 17:57:58 -04:00
Torkel Ödegaard	234d1291f9	Merge branch 'invite' ... Conflicts: public/css/less/gfbox.less public/emails/reset_password.html public/emails/welcome_on_signup.html	2015-08-11 11:22:43 +02:00
Torkel Ödegaard	74932e6311	feat(invite): added specific email for invites to existing grafana users	2015-08-11 10:35:10 +02:00
Torkel Ödegaard	b0b96aa410	Moved reset password and welcome on sign up email to new email build template system	2015-08-11 10:01:52 +02:00
Torkel Ödegaard	06a32ce7be	emails(): updated email templates	2015-07-21 09:59:40 +02:00
Torkel Ödegaard	db0c442eaf	Added configuration options for smtp	2015-06-08 17:56:56 +02:00