91 Commits

Author	SHA1	Message	Date
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rob Harrington	06f10398da	Adding product property filter to shop page	2015-03-06 11:22:52 +11:00
summerscope	2ba632456f	WIP email mailer updates for customer email confirmation etc.	2015-02-27 12:40:13 +11:00
Rob Harrington	c310a3bdaa	Don't use svg for email header	2014-11-20 20:14:57 +11:00
Rob Harrington	f5a5b93c22	Can use relative paths for assets in emails because roadie	2014-11-20 15:45:12 +11:00
Rob Harrington	15d157abc0	Stripping out inline styles from email templates	2014-11-20 15:42:03 +11:00
Rob Harrington	dd6a5ecd0b	Adding helper for assets in mailer views, fixing links in mailer layout	2014-11-19 16:42:31 +11:00
Rob Harrington	70c4b7082d	Split ent confirmation email out into layout and partial	2014-11-06 21:19:21 +11:00
Rob Harrington	5d2d619d66	Assigning @spree_api_key for store	2014-09-19 18:31:33 +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
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
Rafael Schouten	dc266e066f	another few class names	2014-09-10 19:43:14 +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
Rafael Schouten	991d0029dd	add currency localisation	2014-09-08 00:06:53 +10:00
Will Marshall	606981dee9	Merge branch 'maps'	2014-07-29 15:32:23 +10:00
Will Marshall	edaba844d9	Merge branch 'laura_and_will' into new_cart ... Conflicts: app/views/shop/products/_form.html.haml app/views/shop/products/_master.html.haml app/views/shop/products/_variants.html.haml	2014-07-18 17:02:19 +10:00
Rohan Mitchell	19118da82e	Remove old landing page cruft	2014-07-17 14:26:07 +10:00
Will Marshall	547d9f9f5c	Moving payment methods and shipping methods into their own services	2014-07-17 14:19:39 +10:00
Will Marshall	ea357b54ab	Adding some map searching capabilities	2014-07-16 11:19:16 +10:00
Will Marshall	487b8616c0	Adding dereferencing to taxons and reducing our data-set	2014-07-04 13:51:22 +10:00
Will Marshall	ed6bb2275a	Fixing some regressions in tests, switching favicons	2014-06-26 15:04:32 +10:00
Will Marshall	a49fe2bf65	Fixing a regression bug	2014-06-25 16:30:23 +10:00
Will Marshall	a4d12c4515	Patching up IE warning	2014-06-19 15:18:14 +10:00
summerscope	b0b8e14adb	Tweak IE old warning message for stakeholder feedback	2014-06-19 11:30:41 +10:00
summerscope	2dcdd997a2	Turn off IE message ready for logic	2014-06-18 17:14:20 +10:00
summerscope	4d6a92dfe4	Update markup to include links to modern browsers for upgrade	2014-06-18 17:11:08 +10:00
Will Marshall	9bbfc0a393	Starting a set of small functional changes	2014-06-17 12:35:03 +10:00
Will Marshall	74b3c026d2	Merging in maps	2014-06-10 14:54:12 +10:00
Will Marshall	75f1bf4f54	Merging in master	2014-06-10 14:53:49 +10:00
Will Marshall	373f698676	Adding loading infrastructure	2014-06-10 14:52:27 +10:00
Will Marshall	21b6e91913	Moving OFN flash to fixed block	2014-06-10 12:29:31 +10:00
Will Marshall	dbf4f503a9	Restoring my clever flash refactoring	2014-06-10 11:14:52 +10:00
Rohan Mitchell	be644bdcc3	Revert "Reworking flash messages hooray" ... This reverts commit c9d0091cd9.	2014-06-06 16:59:47 +10:00
Will Marshall	c9d0091cd9	Reworking flash messages hooray	2014-06-06 16:41:28 +10:00
Will Marshall	c09ffa832c	Fixing gmaps	2014-06-06 14:04:47 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
Will Marshall	6c68937230	Fixing gmaps	2014-06-05 17:16:19 +10:00
Will Marshall	1ab0d6816c	Merge branch 'laura_and_will' into maps	2014-06-05 15:50:53 +10:00
Will Marshall	476eeef69d	Starting on on the map	2014-06-05 12:18:26 +10:00
Will Marshall	3c21ce8d99	Returning to the basic flash for now	2014-06-04 17:13:19 +10:00
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
summerscope	8a34160713	No change	2014-06-03 11:18:43 +10:00
Will Marshall	13c6ce6786	Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty	2014-05-30 15:52:20 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
summerscope	9886166750	Add in script for google font Open Sans	2014-05-14 15:55:18 +10:00
Will Marshall	c52457505e	Fixing issues with offcanvas	2014-05-09 12:18:05 +10:00
Will Marshall	de369d938f	Starting to work on anchor scrolling	2014-05-08 12:34:16 +10:00
Will Marshall	dd25bfd345	Starting to rework menu	2014-05-05 15:52:48 +10:00