Commit Graph

162 Commits

Author SHA1 Message Date
Will Marshall
166c8c3df4 Adding the basic Angular tabs and changed markup to keep it pretty 2014-03-27 13:01:03 +11:00
Will Marshall
80fe3f7adf Starting dedicated tabs stylesheet 2014-03-27 13:01:03 +11:00
Will Marshall
61e6050e3a Fixing up some more minor regression bugs 2014-03-27 13:01:03 +11:00
Will Marshall
e4bb2f1cdf Keeping Foundation 4 and 5 parallel 2014-03-27 13:01:02 +11:00
Will Marshall
40d1563cd9 Adding our own user registrations controller, reworking sidebar a touch 2014-03-21 15:18:27 +11:00
Rob H
cbd3722380 Merge branch 'master' into bom 2014-03-21 13:47:50 +11:00
Will Marshall
d8a7860d51 Getting some switching into place 2014-03-20 16:58:57 +11:00
Will Marshall
0cabc2eb4d Working sliding panel in basic form 2014-03-20 16:58:57 +11:00
Rob H
ed0b7da20f BOM page has a fancy calculation box for managing group buys 2014-03-20 14:40:24 +11:00
Maikel Linke
cc2ae2f464 moved fullwidth form css 2014-03-19 20:42:21 +11:00
Will Marshall
66bc84920a Putting the Foundation modals in position: fixed 2014-03-14 16:26:00 +11:00
Will Marshall
a954f2c21a Basic Darkswarm version of the Order Confirmation page 2014-03-14 16:11:40 +11:00
Will Marshall
4e03f97f1f Improving links 2014-03-13 14:52:51 +11:00
Will Marshall
8a7dad020b Modifying the back to cart button 2014-03-13 11:24:33 +11:00
Will Marshall
c08f739d4a Minor HTML changes 2014-03-12 15:13:25 +11:00
Will Marshall
3ec80aaaa3 Styling improvements to the popups for producers 2014-03-12 15:08:59 +11:00
Rohan Mitchell
0b39db0165 Display Rails env on landing page in dev and staging 2014-03-12 12:35:52 +11:00
Rob H
9f19e91e90 Merge branch 'master' into bom 2014-03-05 10:15:39 +11:00
Rob H
2a713245a8 BOM: date filter refactor and works with pending changes 2014-03-05 10:14:35 +11:00
Will Marshall
a0abd9c95a Merge branch 'master' into checkout 2014-02-26 15:52:37 +11:00
Rob H
5ec7a10e16 Add date filter fields to BOM 2014-02-21 14:01:33 +11:00
Rohan Mitchell
97a6a812b8 Fix product listing appearing on RHS of page on Firefox 2014-02-19 13:44:31 +11:00
Will Marshall
19e31a264d Tidying footer contact details 2014-02-14 15:49:16 +11:00
Will Marshall
502dba1b3f Fixing bug #281 2014-02-14 15:35:40 +11:00
Will Marshall
e9178570e9 Committing order summary. NO TESTS YET 2014-02-14 15:18:03 +11:00
Will Marshall
a6d58aa498 Partializing and adding yield blocks 2014-02-14 14:40:58 +11:00
Will Marshall
25916caeb4 Starting on Angular models for Checkout, pretties 2014-02-13 16:14:11 +11:00
Will Marshall
cec0ad8a83 Adding ze boilerplate 2014-02-07 13:55:25 +11:00
Will Marshall
b1118735ec One CSS change, adding a test for le price adjustments 2014-02-07 11:09:47 +11:00
Will Marshall
a1f75aa55e Fixing up the top menu a bit 2014-02-06 13:49:27 +11:00
Will Marshall
ed8727708d Improving responsiveness, hopefully 2014-02-06 13:03:40 +11:00
Will Marshall
910d8e033e Increasing space on right of product images 2014-02-05 15:10:45 +11:00
Will Marshall
a3e6a6253c Reworking table cell widths 2014-02-05 14:31:06 +11:00
Will Marshall
35c74e2bf0 Reworking shop to be more responsive 2014-02-05 14:26:41 +11:00
Will Marshall
5eff05d466 Removing the footer cruft 2014-02-04 14:50:18 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00
Rob H
0ac1816eb8 BOM: Add css to to allow visualisation of update status 2014-01-31 11:40:28 +08:00
Will Marshall
7737a5da1d Patching some regressed tests, getting in some responsive layout 2014-01-22 13:38:07 +11:00
Will Marshall
309f7d868d Tweaking ze CSS for pretty 2014-01-22 11:58:37 +11:00
Will Marshall
60bf431008 Stripping HTML from description, since we seem to occasionally get some 2014-01-22 11:55:57 +11:00
Will Marshall
17c6321c8b Adding some basic collapse/expand for variants in Shop 2014-01-22 11:55:57 +11:00
Will Marshall
8879181a27 Adding promo image to about panel 2014-01-21 16:56:00 +11:00
Rob H
701b5aceb4 Add 'All' option to supplier and distributor filters 2014-01-18 14:26:07 +08:00
Will Marshall
6f5ff0ab2c Making a light grey option 2014-01-16 16:49:50 +11:00
Rob H
ee2da3e008 Toggle new view controls on BPE 2014-01-10 00:26:54 +08:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate'
Conflicts:
	config/ng-test.conf.js
2014-01-09 12:07:42 +11:00
Will Marshall
8e0a7d9072 Pretties, fixing the email validation issue with admin authentication steps 2014-01-07 11:04:40 +11:00
Will Marshall
9677ec7159 Starting to build mixins 2014-01-06 16:27:41 +11:00
Rob H
6445275530 Basic layout changes for BPE page 2014-01-05 00:37:36 +08:00
Rob H
a6d7044dfd WIP: Adding basic UI for applying hard filtering to BPE 2014-01-04 19:21:10 +08:00