3256 Commits

Author	SHA1	Message	Date
Will Marshall	c26462db57	Addin some URL stripping	2014-05-28 14:45:26 +10:00
Will Marshall	1af82bd4fb	Forcing scope to parent scope so we don't child our child ... Conflicts: app/assets/javascripts/darkswarm/directives/modal.js.coffee	2014-05-28 14:43:16 +10:00
Rohan Mitchell	403e957111	Further removal of references to 'Admin' from global namespace	2014-05-24 17:15:20 +10:00
Rohan Mitchell	e951f80070	Merge branch 'new-product-form' ... Conflicts: app/assets/javascripts/admin/admin.js.coffee	2014-05-24 17:14:32 +10:00
Rohan Mitchell	e119192cf1	Manually revert merge commit "Hack patching the modals"	2014-05-24 09:23:12 +10:00
Rob H	14611896c0	Simplify new product form	2014-05-23 18:08:29 +10:00
Will Marshall	fb7b9a051a	Hack patching the modals	2014-05-23 17:22:27 +10:00
Rob H	e85c144e87	Remove reference to 'Admin' from global namespace	2014-05-23 11:22:12 +10:00
Rob H	f8776fecff	Move enterprises dashboard controller	2014-05-22 15:46:26 +10:00
Rob H	ed3c23cd90	Split 'My Enterprises' dashboard item into Hubs and Producers	2014-05-22 15:28:25 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	d1b27edefe	Reworking the JS specs	2014-05-22 12:40:46 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	0140472fbc	Adding working modals	2014-05-22 12:40:46 +10:00
Will Marshall	d6512a78d4	Removing position fixed	2014-05-22 12:39:52 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Will Marshall	f997026796	Reworking the JS specs	2014-05-22 10:42:44 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00
Will Marshall	2d0a42b2c2	Adding working modals	2014-05-22 10:42:44 +10:00
Rohan Mitchell	18886c931f	Extract create EnterpriseRelationship to service	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa965e3752	Show a CSS3 animation when a row is added	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f7de504d89	Add stub angular controller for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Will Marshall	91fe8e18d3	Taxon sorting	2014-05-16 10:23:32 +10:00
Will Marshall	8c6e884563	Further improvements, fixing my directive, re-arranging partial	2014-05-16 10:23:31 +10:00
Will Marshall	12ddbb6a32	Reworking the shop page	2014-05-16 10:23:31 +10:00
Will Marshall	c0ba560fa6	Moving empties cart to a magic directive	2014-05-15 14:47:16 +10:00
Will Marshall	1c98f10c20	Adding indexing by user id	2014-05-14 11:08:21 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
Will Marshall	9903e42811	Adding reset password stuff	2014-05-09 14:26:07 +10:00
Will Marshall	1297520051	Authentication steps test	2014-05-09 14:13:39 +10:00
Will Marshall	9241178fe2	Making modal medium man	2014-05-09 12:23:34 +10:00
Will Marshall	c52457505e	Fixing issues with offcanvas	2014-05-09 12:18:05 +10:00
Will Marshall	8595359d4d	Fixing a missing reference to Navigation	2014-05-09 11:03:03 +10:00
Will Marshall	aff33a1f61	Disabling autoscroll	2014-05-08 17:10:29 +10:00
Will Marshall	f5ca01d344	Removing the generic handling on hashes	2014-05-08 17:10:29 +10:00
Will Marshall	ab64de5838	And patching bugs in nav	2014-05-08 17:10:29 +10:00
Will Marshall	5fa0d845a4	Reworking the checkout	2014-05-08 16:38:21 +10:00
Will Marshall	998fb07330	Splitting out the accordion stuff for checkout	2014-05-08 16:07:56 +10:00
Will Marshall	457c9be0f3	Patching a conflict with Foundation JS	2014-05-08 15:14:09 +10:00
Will Marshall	50f5a1c46f	Hash toggling	2014-05-08 13:19:44 +10:00
summerscope	967f2827bf	Make label consistent for Log in	2014-05-08 12:57:04 +10:00
summerscope	e41de9be36	Styling up login modal	2014-05-08 12:51:09 +10:00
Will Marshall	6a2c68701e	Adding small class	2014-05-08 12:50:42 +10:00