4351 Commits

Author	SHA1	Message	Date
Rafael Schouten	83b19ee632	fix haml and formatting on confirm email	2014-09-17 16:56:44 +10:00
Rafael Schouten	79fd8ed98b	dubug mail template	2014-09-17 15:37:38 +10:00
Rafael Schouten	e618c4c2c0	add payment description to checkout	2014-09-17 14:56:29 +10:00
Rafael Schouten	b6fd3a11fa	remove old mailer	2014-09-17 11:54:06 +10:00
Rafael Schouten	f79dfed6ef	use haml for mailer	2014-09-17 11:53:47 +10:00
Rafael Schouten	01c98bf6e4	refactor and bugfix for tests	2014-09-17 01:07:34 +10:00
Rafael Schouten	49476b17e8	fix typos and add missing helper	2014-09-16 16:10:48 +10:00
Rafael Schouten	1aa80e53b1	Merge branch 'master' into currency ... Conflicts: app/helpers/injection_helper.rb db/suburb_seeds.rb	2014-09-16 10:25:22 +10:00
Rafael Schouten	9448e1cbe4	add figaro env config	2014-09-16 00:13:43 +10:00
summerscope	c365047d0c	Short description goes back in producer fat view until we can clean up the HTML formatting	2014-09-12 15:40:12 +10:00
summerscope	42fccd1bdf	Merging master into my branch to make it up to date	2014-09-12 14:48:19 +10:00
summerscope	3cff83b7a5	Kill the outside modal close button styling once and for all	2014-09-12 14:42:58 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rob H	f5048ecf7c	Sends confirmation email when Enterprise is created	2014-09-12 13:24:17 +10:00
Rafael Schouten	9a1b524915	fix icon font class	2014-09-12 12:21:40 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
summerscope	bfa71942fe	Tweaks to input placeholder label	2014-09-12 11:02:28 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
summerscope	9c33be911c	Update placeholder label	2014-09-12 10:49:59 +10:00
summerscope	6d7fd6dc94	Add in logic to change right hand label if this is the current hub	2014-09-12 10:48:33 +10:00
Rob H	ef8f611458	Adding countries and states to registration	2014-09-11 17:07:05 +10:00
Rob H	7dc42c9e39	Creating an enterprise works in registration process	2014-09-11 17:07:05 +10:00
Rob H	3d4e00a03c	Swtich API key injection over to helper	2014-09-11 17:07:05 +10:00
Rob H	c92aa41e28	Adding introduction and details pages to registration process	2014-09-11 16:34:19 +10:00
Rob H	595aa760cb	Loads registration page with authentication	2014-09-11 16:34:19 +10:00
summerscope	94165f17e4	Merging master into this branch to keep repository up to date	2014-09-11 16:33:44 +10:00
summerscope	24507c6c0a	turn off Profile filter again until ready to support this	2014-09-11 16:29:38 +10:00
summerscope	71918539b8	Undo changing name Hubs to Shops, for the moment	2014-09-11 15:40:35 +10:00
summerscope	16ad465571	tweak placeholder name	2014-09-11 15:40:12 +10:00
Rob H	9085741f3c	Removing enterprises form from user edit page	2014-09-11 15:19:23 +10:00
Rob H	8cc5c2246a	Hide 'Create New' enterprise link on dashboard when user has reached limit	2014-09-11 15:19:23 +10:00
Rob H	60297eb5c8	Hide 'New Enterprise' link on index page when user has reached limit	2014-09-11 15:19:23 +10:00
Rob H	41b286f80f	Delete specific E2ER in spec	2014-09-11 14:54:51 +10:00
Rob H	3e1f4628e3	Can change owner of enterprises from index page	2014-09-11 14:51:22 +10:00
Rob H	e106c7a0cd	Initialise user autocomplete element using data from element itself rather than AJAX request	2014-09-11 14:39:15 +10:00
Rob H	13d814ff23	Adding user autocomplete directive to speed up specification of owner for enterprises	2014-09-11 14:39:15 +10:00
Rob H	73a32fdaf1	Remove distributor_info: 'how does it work' from enterprises edit page	2014-09-11 14:39:14 +10:00
Rob H	8e91e4513d	Remove rich text editors from about us in enterprise editor	2014-09-11 14:39:14 +10:00
Rob H	4bde6a0a3d	WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen	2014-09-11 14:39:14 +10:00
Rob H	138e0281a3	Specify owner for enterprise create action	2014-09-11 14:39:14 +10:00
Rob H	58f28f112a	Enterprise index type selection is only visible to super admin	2014-09-11 14:22:47 +10:00
summerscope	997479f5be	Change label on mobile menu	2014-09-11 13:05:21 +10:00
Rafael Schouten	0fa4540cec	Merge branch 'master' into currency	2014-09-11 12:09:18 +10:00
Rafael Schouten	09a4c4e17e	add spree currency helper, fix some typos and specs	2014-09-11 11:47:55 +10:00
Rafael Schouten	c1971d015c	fix bug in mailer	2014-09-10 19:59:39 +10:00
Rafael Schouten	dc266e066f	another few class names	2014-09-10 19:43:14 +10:00
Rafael Schouten	44e9cf5ade	add currency spec file and update some class names	2014-09-10 18:22:33 +10:00
Rohan Mitchell	4168ea054b	For body content, cloak the home page only. JS should be cached after that.	2014-09-10 12:12:46 +10:00
Rohan Mitchell	b49eb8fe03	Hide angular templates on page load	2014-09-10 11:50:30 +10:00
Rob H	3ee0cf46e0	Merge branch 'working' into merging	2014-09-08 10:12:31 +10:00