4051 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rafael Schouten	6fc36a3e6c	swap redundant producer modal for general enterprise modal	2014-10-07 10:48:04 +11:00
Rafael Schouten	e476324c60	fix for_order_cycle test	2014-10-07 00:22:45 +11:00
Rafael Schouten	ec6805f573	use shared partial for no results	2014-10-06 23:51:19 +11:00
Rafael Schouten	7805d46743	more angular documentation	2014-10-06 23:20:43 +11:00
Rafael Schouten	881e82e825	add some angular documentation	2014-10-06 22:59:06 +11:00
Rafael Schouten	2ae325455a	fix producer taxon filtering bug	2014-10-06 22:58:48 +11:00
Rafael Schouten	922e335e83	add is_hub to model	2014-10-06 15:42:23 +11:00
Rafael Schouten	cc6af82823	move reports abilitiy to can manage products block, producers need to use this too	2014-10-06 15:40:41 +11:00
Rafael Schouten	76e170eb3a	move icons into cached, for now	2014-10-06 10:44:49 +11:00
Rafael Schouten	c495e967cb	bugfix and extend angular enterprise spec	2014-10-06 01:36:18 +11:00
Rafael Schouten	017d6b1273	move for order cycles permission, for now, but needs review	2014-10-06 01:35:46 +11:00
Rafael Schouten	9eb770aed7	fix sidebar show/hide	2014-10-05 01:44:40 +10:00
Rafael Schouten	2f76a7ba80	add comment for hub sells own case	2014-10-05 01:44:12 +10:00
Rafael Schouten	58c39b340d	remove duplicate default value assignment	2014-10-05 01:43:50 +10:00
Rafael Schouten	698126edb2	specifify visible enterprises in tests	2014-10-04 01:01:04 +10:00
Rafael Schouten	b3482a087b	separate enterprises from visible enterprises	2014-10-04 01:00:37 +10:00
Rafael Schouten	a552fb18da	style profile check	2014-10-04 01:00:02 +10:00
Rafael Schouten	2670d2b0ad	cleanup serializer	2014-10-04 00:59:41 +10:00
Rafael Schouten	01063367c4	clickable show profiles label	2014-10-04 00:59:17 +10:00
Rafael Schouten	8805079faa	use attubutes instead of save!	2014-10-03 14:03:34 +10:00
Rafael Schouten	b3520c4385	Bugfix for specs	2014-10-02 16:49:32 +10:00
Rafael Schouten	526ab8b80f	use is_distributor bool	2014-10-02 16:28:01 +10:00
Rafael Schouten	f29898886d	return basic css and js for oldskool login that somehow still exists	2014-10-02 13:24:59 +10:00
Rafael Schouten	1e84e4fa85	own and any instead of single and full for abilities	2014-10-02 13:11:19 +10:00
Rafael Schouten	ce9b132ab5	only show visible enterprises	2014-10-02 13:10:46 +10:00
Rafael Schouten	4c1fc5671f	Minor fixes	2014-10-02 10:43:17 +10:00
Rafael Schouten	e62e87549a	commit this elsewhere	2014-10-02 10:41:43 +10:00
Rafael Schouten	62f7114fa1	Merge branch 'cleanup' into migrate_ent_types ... Conflicts: app/views/home/_hubs.html.haml	2014-10-02 10:02:08 +10:00
Rafael Schouten	47dc001735	merge has_shopfront and is_distibutor	2014-10-01 20:27:53 +10:00
Rafael Schouten	3877bed62b	use enterprise modal	2014-10-01 18:51:49 +10:00
Rafael Schouten	ccdcf16cec	rename file	2014-10-01 18:47:50 +10:00
Rafael Schouten	54b138b2cc	add transclusion to modal directive by default	2014-10-01 18:47:22 +10:00
Rafael Schouten	56a9658b14	update ability spec	2014-10-01 16:55:41 +10:00
Rafael Schouten	47991f192e	tweak migration	2014-10-01 16:49:47 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	1ec4f2e456	Merge branch 'ent_types_frontend' into migrate_ent_types ... Conflicts: app/models/enterprise.rb	2014-10-01 16:10:43 +10:00
Rafael Schouten	fa41f6dc40	add rollback to migration	2014-10-01 13:02:21 +10:00
Rob Harrington	5497f229e1	Ignoring enterprise ownership before_validations when no owner set	2014-10-01 11:49:46 +10:00
Rafael Schouten	206c8da0ba	remove unused css*	2014-09-30 23:53:45 +10:00
Rafael Schouten	a49991c696	set abilities tests to pending, need to discuss further	2014-09-28 22:55:49 +10:00
Rafael Schouten	dc7c9ea272	commit updated schema	2014-09-28 22:37:26 +10:00
Rafael Schouten	58f13a3e06	update migration	2014-09-28 12:57:27 +10:00
Rafael Schouten	5c0d846643	bugfix sells and is_distributor specs and code	2014-09-28 11:55:46 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rafael Schouten	beb85e862a	get type > sells migration mostly working	2014-09-27 15:21:27 +10:00
Rafael Schouten	92a40fc842	order mailer edits 0.6.3	2014-09-26 17:21:41 +10:00
Rob Harrington	4b2f1cefa0	Spliting order management abilities out of product management abilities	2014-09-26 17:11:11 +10:00
summerscope	c91d707806	Merge branch 'master' into ent_types_frontend	2014-09-26 15:07:30 +10:00
Rob Harrington	299b0fe5be	Allowing all enterprise users to access products	2014-09-26 15:01:23 +10:00
summerscope	2ea0c89899	Style the modal headers	2014-09-26 15:01:23 +10:00