1517 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	e35eccca93	Revert 3b3815a 6c5539a 39c2803 - remove non-mangling js compression which breaks build	2014-01-09 11:18:54 +11:00
Rohan Mitchell	3b3815a09d	Require uglifier, should fix asset precompilation	2014-01-09 09:35:29 +11:00
Rohan Mitchell	6c5539a1da	Update js compressor for staging as well as production	2014-01-08 17:25:32 +11:00
Rohan Mitchell	39c2803493	Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4	2014-01-08 16:45:21 +11:00
Rohan Mitchell	a67cea3fcd	Precompile darkswarm css and js	2014-01-08 15:59:09 +11:00
Will Marshall	533a987684	Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom	2014-01-08 15:20:33 +11:00
Rohan Mitchell	c08c42b087	Fix inconsistent test fails - insignificant ordering	2014-01-08 15:11:46 +11:00
Will Marshall	e5514920c8	Fixing up the error messages in our specs	2014-01-08 15:11:23 +11:00
Will Marshall	e0c352d135	Merge branch 'master' into darkswarm ... Conflicts: spec/features/admin/products_spec.rb	2014-01-08 14:49:47 +11:00
Will Marshall	7838d759ee	Removing redundant functionality from the Order Populator	2014-01-08 14:45:40 +11:00
Rohan Mitchell	5f4d787d26	Fix sorting error in spec	2014-01-08 14:43:46 +11:00
Rohan Mitchell	c42d741d3d	Remove browse product specs for removed feature	2014-01-08 14:41:06 +11:00
Rohan Mitchell	4a74c2624c	Remove specs for removed features	2014-01-08 14:15:06 +11:00
Rohan Mitchell	ea3e697b73	Rename method for clarity, remove outdated specs for OrderPopulator	2014-01-08 14:14:45 +11:00
Rohan Mitchell	20ad906f7a	Fix multicart use of OrderPopulator	2014-01-08 14:13:19 +11:00
Rohan Mitchell	dd16934496	Remove redundant serializer spec, reinstate creation of order distribution charges	2014-01-08 13:22:34 +11:00
Rohan Mitchell	4f7fdd430f	Update failing controller spec - order needs distributor set	2014-01-08 11:58:53 +11:00
Rohan Mitchell	df53a14d4b	Remove specs that are no longer relevant - distribution selection on product page no longer present	2014-01-08 11:51:26 +11:00
Rohan Mitchell	eda4f241e2	Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests	2014-01-08 11:39:05 +11:00
Rohan Mitchell	30eb11ad84	Allow select_distribution to take no order_cycle	2014-01-08 11:38:21 +11:00
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Rohan Mitchell	458f91ef91	Add feature spec helper to select distributor and order cycle	2014-01-08 11:31:44 +11:00
Rohan Mitchell	2f98888acd	Remove active model serializers gem	2014-01-08 11:31:05 +11:00
Will Marshall	5e041a6f4f	Uncommenting the old OP code	2014-01-08 10:35:27 +11:00
Will Marshall	06ab4d5384	Patching some further regression bugs	2014-01-07 15:28:11 +11:00
Will Marshall	936d80b2c5	Removing a redundant test: no longer show current distributor and order cycle	2014-01-07 15:16:36 +11:00
Will Marshall	4d03f65766	Reworking everything to use RABL	2014-01-07 15:06:47 +11:00
Will Marshall	32c7682da2	Removing the serializers to fix regression issues	2014-01-07 11:12:44 +11:00
Will Marshall	641b7dcdf4	Removing the image serializer, causing regression bugs	2014-01-07 11:05:10 +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
Will Marshall	1264af584c	Removing a pointless test	2014-01-06 15:56:28 +11:00
Will Marshall	dd1b3311d7	Removing all the old order populator stuff	2014-01-06 15:23:21 +11:00
Will Marshall	49c2cc3696	Getting in the tab navigation	2013-12-20 14:23:14 +11:00
Will Marshall	0db7eae7f8	Getting images working	2013-12-20 11:49:08 +11:00
Will Marshall	751e98443f	Removing LOADS of code	2013-12-19 16:47:27 +11:00
Will Marshall	e20120b9ca	Fixing a syntax error	2013-12-19 16:05:35 +11:00
Will Marshall	985cebb44a	Massaging the form to push orders to the cart: some refactoring still required	2013-12-19 15:51:51 +11:00
Will Marshall	1048bab303	Patching up some edge cases	2013-12-19 14:20:16 +11:00
Will Marshall	87cef4edcc	Reverting previous commit	2013-12-19 12:29:21 +11:00
Will Marshall	aaa2999ee1	Dropping our override of ActionMailer	2013-12-19 11:58:21 +11:00
Will Marshall	37f8ce68fb	Adding one additional mailer test	2013-12-19 11:58:08 +11:00
Will Marshall	b5dd921a81	Our feature spec is breaking but we'll work that out	2013-12-19 10:44:47 +11:00
Will Marshall	b3a4d826b8	Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff	2013-12-18 17:05:47 +11:00
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