20 Commits

Author	SHA1	Message	Date
Jonathan Kolyer	b4a3c73917	VRFS-1483 fixed batch email test so it should always work in test Rails.env	2014-04-04 10:18:09 +00:00
Seth Call	700ef04edf	* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test	2014-04-04 23:16:38 +01:00
Seth Call	d1622cfd95	* fix batch_mailer tests	2014-04-04 20:02:44 +01:00
Jonathan Kolyer	a7c8d9311f	VRFS-1483 fixing tests	2014-04-03 05:03:28 +00:00
Jonathan Kolyer	accaa99e38	VRFS-1483 integrating opt-out; fixing tests	2014-04-01 14:42:26 +00:00
Jonathan Kolyer	21bd8fcf2f	VRFS-1483 removed debug code	2014-03-19 16:29:19 +00:00
Jonathan Kolyer	d15c1dbdfd	VRFS-1483	2014-03-19 07:15:38 +00:00
Jonathan Kolyer	4ba18a88ee	VRFS-1483 integrating sendgrid_smtpapi	2014-03-19 06:20:58 +00:00
Jonathan Kolyer	c6c12e7b9e	Merge branch 'develop' into vrfs1483	2014-03-19 00:23:32 +00:00
Seth Call	d6210c0b2f	* VRFS-1474 - link in friend invite	2014-03-25 15:29:08 +00:00
Seth Call	b04c7bcea5	* VRFS-871 - user-to-user messaging complete	2014-03-20 11:53:26 +00:00
Jonathan Kolyer	cdb271bf98	VRFS-1483 added async support	2014-03-18 22:50:06 +00:00
Jonathan Kolyer	40a2049bdf	VRFS-1483 added from_email column to email_batches	2014-03-18 20:31:23 +00:00
Jonathan Kolyer	98a4553f72	VRFS-1483 specs for test users	2014-03-18 18:33:48 +00:00
Jonathan Kolyer	3204de01e6	VRFS-1483 merge	2014-03-18 15:13:03 +00:00
Jonathan Kolyer	e6d0851391	VRFS-1483 adding first set of updates for batch emails	2014-03-18 15:07:45 +00:00
Jonathan Kolyer	ee9b203f99	vrfs-775: integrating new musician emails	2013-11-26 00:03:42 -06:00
Seth Call	b40e240cd4	* VRFS-711 welcome email added; also, VRFS-725 fixing signout	2013-09-26 17:33:28 +00:00
Seth Call	cf907cc060	* VRFS-711 - adding new welcome email with useful links	2013-09-26 13:43:02 +00:00
Seth Call	6ea4bae05c	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00