Commit Graph

127 Commits

Author SHA1 Message Date
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
Rob H
ffbfbffb28 WIP: Add basic page nav controls to BPE 2013-12-23 09:22:31 +08:00
Will Marshall
49c2cc3696 Getting in the tab navigation 2013-12-20 14:23:14 +11:00
Will Marshall
21d99c8e56 Directing our form to the order populator 2013-12-18 15:17:08 +11:00
Will Marshall
adbfdafff3 Lots of styling improvements 2013-12-18 13:13:58 +11:00
Will Marshall
a3dfe1b147 Working on the HTML structure, variants etc 2013-12-18 12:26:34 +11:00
Will Marshall
3ed8dc5a7d Tiny typography change 2013-12-17 15:56:36 +11:00
Will Marshall
c4c5f3a8c7 Merging from master 2013-12-17 14:18:21 +11:00
Rohan Mitchell
5c744c7295 Move enterprises_distributor_info_rich_text_feature styles into central files 2013-12-13 16:01:36 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Will Marshall
d5081e4cc5 Working on the pretties 2013-12-13 09:19:54 +11:00
Rohan Mitchell
03aa5604e5 Reorder columns on BPE 2013-12-12 10:52:17 +11:00
Will Marshall
36694822db Starting to prettify 2013-12-12 10:28:43 +11:00
Rohan Mitchell
6956eb3f94 Basic styling for variant unit fields on BPE 2013-12-06 14:30:38 +11:00
Will Marshall
f525b7aea1 Adding the distributors controller 2013-12-04 15:58:25 +11:00
Will Marshall
0032a806b5 Further work on Darkswarm 2013-12-04 14:12:13 +11:00
Will Marshall
9efd7c2d69 Getting the darkswarm build flow up and running. Like a boss 2013-12-04 13:09:30 +11:00
Will Marshall
3d019bdcd5 Starting to partialise things 2013-11-29 16:52:14 +11:00
Will Marshall
175cd86976 Adding darkswarm basics 2013-11-29 16:38:14 +11:00
Will Marshall
69459847ca Fixing some responsiveness issues on the home page 2013-11-28 15:42:00 +11:00
Rohan Mitchell
94c33e5f45 Colour order cycle rows based on their status 2013-11-22 11:31:04 +11:00
Will Marshall
f9a4718bdd Reworking the homepage styles to work on mobile as well as screen 2013-11-06 14:14:55 +11:00
Will Marshall
7d21dd053a Merging 2013-11-01 16:50:28 +11:00
Will Marshall
8f27c7be80 Fixing a clearing bug on the home page 2013-11-01 16:49:28 +11:00
Rohan Mitchell
25b0306a93 Ensure css is precompiled, reformat configs 2013-11-01 16:22:54 +11:00
Rohan Mitchell
eb997c94a2 Mark inactive distributors on supplier distributors list 2013-10-31 14:59:47 +11:00
Rohan Mitchell
758676c1ea When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products 2013-10-31 14:49:26 +11:00
Rohan Mitchell
32889715f0 Grey out hubs that have no products available for distribution and are not in an order cycle 2013-10-30 16:09:18 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
2fe23c53ed Rename region to group 2013-10-30 13:57:33 +11:00
Rohan Mitchell
cbdd8a0091 Fix enterprise admin form style, which was being clobbered by CMS styles 2013-10-30 09:56:44 +11:00
Rohan Mitchell
39c60a84d6 Rename files from OFW to OFN convention 2013-10-18 17:15:21 +11:00
Rohan Mitchell
767478a0ee Add link to change hub 2013-09-23 09:17:17 +10:00
Rohan Mitchell
9811851e29 Comment out order cycles debug styling that breaks tests 2013-09-20 13:08:54 +10:00
Rohan Mitchell
00fe10e847 Reposition order cycle admin debug info 2013-09-20 09:29:26 +10:00
David Cook
e4127358c3 Rearrange admin payment methods table (BH#73) 2013-09-19 12:12:50 +10:00