1471 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	1f012dc52c	Patching up the tests to check on our serialisers	2013-12-18 16:15:23 +11:00
Will Marshall	6d124b3275	Failing tests, forcing the orders close text to change	2013-12-18 16:12:06 +11:00
Will Marshall	21d99c8e56	Directing our form to the order populator	2013-12-18 15:17:08 +11:00
Will Marshall	4b7605212e	Adding text trunctation in Angular	2013-12-18 14:45:32 +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	e23b33ab48	Adding variants display	2013-12-18 11:35:25 +11:00
Will Marshall	3ed8dc5a7d	Tiny typography change	2013-12-17 15:56:36 +11:00
Will Marshall	f146610a93	Fixing a recursion bug in Angular	2013-12-17 15:52:21 +11:00
Will Marshall	7ea9cf6862	Adding price to serializer	2013-12-17 15:45:06 +11:00
Will Marshall	67fcf0f534	Fixing up the feature specs	2013-12-17 15:26:49 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00
Will Marshall	ece46811f9	Adding serializers also	2013-12-17 14:04:36 +11:00
Will Marshall	843a1133ef	Moving to use custom serializers for ze JSON API	2013-12-17 13:48:08 +11:00
Rohan Mitchell	e443495a7e	Remove reference to deleted stylesheet	2013-12-17 12:48:44 +11:00
Rohan Mitchell	f1f3d7a99c	Remove duplicate migration	2013-12-13 16:01:36 +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	222ed20361	Defaulting to bulk products	2013-12-13 15:57:32 +11:00
Will Marshall	63349c7c9a	Fixing some breaking bugs in the refactored mailer	2013-12-13 15:40:23 +11:00
Will Marshall	f6af9e78ac	Adding destroy ability to enterprise users	2013-12-13 15:40:23 +11:00
Will Marshall	92b3d496a4	Fixing the bugherd script to use the production one	2013-12-13 15:40:23 +11:00
Will Marshall	12743850b4	Removing a chili, refactoring order mailer	2013-12-13 15:40:22 +11:00
Rohan Mitchell	124b6df75d	Show undated order cycles on index page	2013-12-13 14:51:43 +11:00
Will Marshall	6e36142809	Making some changes to the data on the products inventory page	2013-12-13 11:39:45 +11:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Will Marshall	d5081e4cc5	Working on the pretties	2013-12-13 09:19:54 +11:00
Will Marshall	36694822db	Starting to prettify	2013-12-12 10:28:43 +11:00
Will Marshall	8f41078c0c	Reworking our bindings so everything stacks on objects and automagically updates	2013-12-11 15:39:50 +11:00
Will Marshall	bc4f472523	Fixing up the tests with some refactoring	2013-12-11 15:33:57 +11:00
Will Marshall	71a5d84a1d	Filtering the products to the current order cycle	2013-12-11 15:06:07 +11:00
Will Marshall	3903173848	Working reloading of products, changing order cycles, sticky state	2013-12-11 13:36:12 +11:00
Will Marshall	04d8949177	Tweaks to the JS, redirection on the controller	2013-12-11 12:53:50 +11:00
Will Marshall	44fe304efb	Building out and testing our Product and OrderCycle Angular stuff	2013-12-11 12:42:33 +11:00
Will Marshall	4db8f755bf	Getting an order cycle update function in place like a boss	2013-12-11 12:42:02 +11:00
Will Marshall	63dfa0b696	Getting the test framework set up for Angular, setting up a products fetch stub	2013-12-06 15:24:42 +11:00
Rohan Mitchell	e70513b06c	Remove off-canvas class for landing page, allowing it to scroll	2013-12-06 11:47:07 +11:00
Will Marshall	b806947e7b	Merge branch 'master' into darkswarm	2013-12-06 11:08:17 +11:00
Rohan Mitchell	fdc98ba24c	Convert Karma config file to v0.10 compatible format ... Conflicts: config/ng-test.conf.js	2013-12-06 11:07:32 +11:00
Will Marshall	3670d68265	Correctly failing tests forcing us to build out OrderCycle switching in Angular	2013-12-05 16:48:29 +11:00
Will Marshall	102cb62b60	Starting to build out the Angular.js app	2013-12-05 16:31:22 +11:00
Will Marshall	3cda12b8dd	Refactoring the order cycle partials	2013-12-05 16:31:12 +11:00
Will Marshall	165513fdea	Adding some feature tests for the basic products page	2013-12-05 16:30:59 +11:00
Will Marshall	3f4f5143ff	Refactoring the order cycle partials	2013-12-05 16:30:39 +11:00
Will Marshall	7e9f389900	Getting the order cycles dropdown rendering correctly	2013-12-05 15:15:15 +11:00
Will Marshall	ec72e9137a	We can now hit the index page	2013-12-05 15:07:46 +11:00
Will Marshall	4543e08872	Renaming everything to Shop	2013-12-05 13:40:05 +11:00
Will Marshall	f525b7aea1	Adding the distributors controller	2013-12-04 15:58:25 +11:00
Will Marshall	720d66b379	Merge branch 'master' into ui_setup	2013-12-04 14:28:20 +11:00
Will Marshall	578651ddae	forcing SSL in staging	2013-12-04 14:26:22 +11:00
Will Marshall	9876a5f27b	Merge branch 'master' into ui_setup	2013-12-04 14:13:06 +11:00