224 Commits

Author	SHA1	Message	Date
Will Marshall	0f6bd7049c	Starting to build out producers Angular page	2014-04-30 12:52:47 +10:00
Will Marshall	4ca148ee93	Starting on the producers controller	2014-04-30 12:05:53 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Rohan Mitchell	ad6021a116	Revert "In specs, correctly disable referential integrity for postgres" ... This reverts commit 1610e1448a.	2014-04-25 17:14:25 +10:00
Rohan Mitchell	1610e1448a	In specs, correctly disable referential integrity for postgres	2014-04-25 16:58:25 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Will Marshall	f6bfc71c4b	Various small functional tweaks	2014-04-24 16:28:12 +10:00
Rohan Mitchell	e6d988ff34	Nest variant soft delete route under product resource	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e28a450875	Add API call to soft-delete a variant	2014-04-24 13:20:16 +10:00
Will Marshall	16251fe5ea	Merging with master	2014-04-23 14:43:39 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Will Marshall	8b7d2641f9	Starting to prettify with Laura	2014-04-22 15:46:14 +10:00
Will Marshall	6753b96f29	Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window	2014-04-18 13:01:36 +10:00
Rob H	5345e8d339	Add accessible_by scope to enterprises model and accessible action to enterprises API	2014-04-17 12:23:09 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rob H	83e3172901	Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved	2014-04-16 18:27:50 +10:00
Will Marshall	171c8c6ed1	Merging in with master	2014-04-16 16:16:15 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Will Marshall	6e35dc7168	Merging with master	2014-04-11 13:09:22 +10:00
Will Marshall	4bb9776233	Adding bindonce and infinite scroll to karma	2014-04-08 18:16:46 +10:00
Will Marshall	5ac5b74f01	Setting up a Rake task for Jasmine/Karma	2014-04-08 18:09:02 +10:00
Rob H	b1c7f06779	Add dropdown.js.coffee to karma config to stop tests failing	2014-04-05 10:06:58 +11:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Will Marshall	e48a25983a	Starting a working forgot password system	2014-03-27 15:11:11 +11:00
Will Marshall	17bb1f9d25	Getting the tests working once more	2014-03-27 13:01:05 +11:00
Will Marshall	a89de9a80f	Patching our patch	2014-03-27 13:01:04 +11:00
Will Marshall	40d1563cd9	Adding our own user registrations controller, reworking sidebar a touch	2014-03-21 15:18:27 +11:00
Will Marshall	451e76b33f	Tweaking our paypal express plumbing further	2014-03-07 15:27:52 +11:00
Will Marshall	df435c0a38	Adding Paypal plumbing	2014-03-07 15:10:20 +11:00
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +11:00
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	5ec7a10e16	Add date filter fields to BOM	2014-02-21 14:01:33 +11:00
Will Marshall	6a861de1e1	Reworking the checkout form some more	2014-02-18 14:50:50 +11:00
Will Marshall	5c498735b0	Moving from new to edit	2014-02-14 14:26:31 +11:00
Will Marshall	b11533a629	Renaming ShopController to Shop::ShopController	2014-02-07 16:52:18 +11:00
Will Marshall	26e4adf7a6	Adding the routes, controller, new action and some tests	2014-02-07 13:53:36 +11:00
Rob H	6243642cc9	Require timeago in karma config so that js tests run	2014-02-05 23:44:41 +11:00
Rob H	9373dcea3d	Merge branch 'master' into bom	2014-01-31 12:32:23 +08:00
Rob H	c6d9bfafbc	Create shared services module for backend angularjs, rename modules	2014-01-17 13:48:28 +08:00
Rob H	970942ff42	Add JS spec and basic initialisation code for BOM	2014-01-17 13:16:35 +08:00
Rob H	4e9ae7549e	Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page	2014-01-16 13:20:07 +08:00
Rohan Mitchell	1ebfea9c76	Require uglifier, should fix asset precompilation	2014-01-16 14:16:45 +11:00
Rohan Mitchell	7d224fb5ac	Update js compressor for staging as well as production	2014-01-16 12:06:00 +11:00
Rohan Mitchell	38a20e4a8c	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-16 12:05:43 +11:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rohan Mitchell	8f479868b4	Fix js test errors - foundation not found, but not reqd for testing angular	2014-01-09 11:44:03 +11:00
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