3783 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
summerscope	bfa71942fe	Tweaks to input placeholder label	2014-09-12 11:02:28 +10:00
summerscope	01397b2e49	Tweaks to filter box	2014-09-12 11:01:35 +10:00
summerscope	ecacde41dd	Tweaks to big input for small screens	2014-09-12 11:00:10 +10:00
summerscope	126e9e82a6	Add in blues for use	2014-09-12 10:58:51 +10:00
summerscope	9c33be911c	Update placeholder label	2014-09-12 10:49:59 +10:00
summerscope	6d7fd6dc94	Add in logic to change right hand label if this is the current hub	2014-09-12 10:48:33 +10:00
summerscope	de64a5154b	Fixing markup icon class name was incorrect	2014-09-11 17:13:07 +10:00
summerscope	a642ad0855	More style detail for small view inactive hub small views	2014-09-11 17:00:59 +10:00
summerscope	94165f17e4	Merging master into this branch to keep repository up to date	2014-09-11 16:33:44 +10:00
summerscope	24507c6c0a	turn off Profile filter again until ready to support this	2014-09-11 16:29:38 +10:00
summerscope	1eef483c44	Hub node styling for different use cases of active / inactive / current / open / closed	2014-09-11 15:42:37 +10:00
summerscope	af064a3fc7	Adding more spacing for fat view on small devices - vertical spacing for each chunk	2014-09-11 15:42:08 +10:00
summerscope	de7837aea9	New greys and translucent colors for global use	2014-09-11 15:41:28 +10:00
summerscope	7d0cf2ace9	Adding rounded corners to producers nodes for active table	2014-09-11 15:41:01 +10:00
summerscope	71918539b8	Undo changing name Hubs to Shops, for the moment	2014-09-11 15:40:35 +10:00
summerscope	16ad465571	tweak placeholder name	2014-09-11 15:40:12 +10:00
summerscope	997479f5be	Change label on mobile menu	2014-09-11 13:05:21 +10:00
summerscope	bebe0c41f6	Styling for hubs and producers - adding rounded corners, making current shop less intense	2014-09-11 11:50:46 +10:00
Rohan Mitchell	69d1111c73	Fix expected payment amount	2014-09-10 17:00:51 +10:00
Rohan Mitchell	32a2e793ad	When deleting enterprise relationships, delete dependent permissions	2014-09-10 14:49:15 +10:00
Rohan Mitchell	c297b7014a	Charge customers for their shipping fee	2014-09-10 14:01:36 +10:00
Rohan Mitchell	4168ea054b	For body content, cloak the home page only. JS should be cached after that.	2014-09-10 12:12:46 +10:00
Rohan Mitchell	b49eb8fe03	Hide angular templates on page load	2014-09-10 11:50:30 +10:00
Rob H	78a70292ac	Moved attributes are actually delcared in the right place for Enterprise Serializer	2014-09-08 15:39:17 +10:00
Rob H	dfa837cac6	Moved cached properties which should not be cached	2014-09-08 15:01:34 +10:00
Rob H	b49a4cbc4f	Fix intermittent failing spec	2014-09-08 11:11:07 +10:00
Rob H	3ee0cf46e0	Merge branch 'working' into merging	2014-09-08 10:12:31 +10:00
Rob H	36891c73cb	Merge branch 'master' into merging	2014-09-08 10:09:51 +10:00
Rob H	a968aa9b91	Removing float:left which weirdly breaks specs	2014-09-08 10:09:00 +10:00
Rob H	5fb4110328	Adding distributor and producer checkboxes to enterprise index	2014-09-07 21:04:53 +10:00
Rob H	6540bb8efc	Adding select field for enterprise type to index when super admin	2014-09-07 19:51:14 +10:00
Rob H	b8fadb50ae	Special Instructions in checkout are actually wired up	2014-09-06 12:00:27 +10:00
Rob H	9dc2b248c7	Bulk management permissions make more sense	2014-09-06 09:37:34 +10:00
Rob H	ee4a1925fe	Bulk Order Management works with navigation helper override	2014-09-06 00:34:27 +10:00
Rob H	780df6bfe0	Hide 'profile type' form element for non super-admin users	2014-09-05 18:38:43 +10:00
Rob H	58dcdbd9c4	Restricting ability to change enterprise type at the controller level	2014-09-05 18:30:15 +10:00
summerscope	2e8ec3df18	Tweak placeholder messages for big inputs	2014-09-05 18:07:50 +10:00
summerscope	6271b83fad	Tweak placeholder messages for big inputs	2014-09-05 18:07:28 +10:00
summerscope	778cf0326b	Changing placeholder for	2014-09-05 18:04:02 +10:00
summerscope	94e3946d52	producer list view styling	2014-09-05 17:54:16 +10:00
summerscope	0b74242f49	make classes more generic for more use-cases	2014-09-05 17:53:52 +10:00
summerscope	bb82fc4b20	move generic things into active table	2014-09-05 17:53:27 +10:00
summerscope	6e10c416e2	hub view styling	2014-09-05 17:53:14 +10:00
summerscope	ab44046658	skinny view producers remove unnecessary spacer element	2014-09-05 17:52:36 +10:00
summerscope	a9619a6dca	Changes to markup on producer page to adjust layout	2014-09-05 17:50:50 +10:00
Rob H	20bfcd6e48	Switching enterprise relationships form around	2014-09-05 17:11:57 +10:00
summerscope	60ac3f29a5	Producers page WIP	2014-09-05 16:41:00 +10:00
summerscope	adb8b6b02f	Styling for help icon	2014-09-05 16:40:59 +10:00
summerscope	b3f97479d3	Hide profile filter from search for the mo	2014-09-05 16:40:59 +10:00
Rob H	097367a9f8	Map modals for 'profile' enterprises do not display shopping options	2014-09-05 16:28:08 +10:00