Rohan Mitchell
02d68c662b
Add titles to all darkswarm pages
2015-06-16 15:31:35 +10:00
Rohan Mitchell
b540f645c3
Split CSS to overcome IE9's 4096 rule limit
2015-06-16 11:57:50 +10:00
Rohan Mitchell
686a54c121
Make 'selling food' alert visible, basic styling
2015-06-10 19:03:25 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Rohan Mitchell
4a59c85b3e
Inject current hub from AMS rather than RABL
2015-05-27 15:44:01 +10:00
Rohan Mitchell
c8f14f1ee9
Fetch fonts through https, fixes mixed-security error that prevents fonts loading
2015-05-26 10:29:20 +10:00
Rohan Mitchell
b86872095a
Add google analytics
2015-05-13 14:52:17 +10:00
summerscope
3dbe45172d
Registration markup tweak with new icons
2015-05-02 18:24:55 +10:00
summerscope
4f145104d2
Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.)
2015-05-02 17:58:35 +10:00
summerscope
330d23c606
Move alert for 'join now' off global template onto homepage template only.
2015-05-02 15:23:12 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
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
