7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	65ac9d7226	Merge branch 'master' into reg	2014-10-09 09:26:17 +11:00
Rafael Schouten	e7b847542f	bugfix tab selection	2014-10-08 01:59:56 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	9b6db2bff4	simplify tab selection	2014-10-07 10:49:57 +11:00
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	f0c9e7cd44	fix for tests, remove open in new tab	2014-10-04 13:12:36 +10:00
Rafael Schouten	f3fc70ebf0	Merge branch 'master' into raf_bugfix ... Conflicts: app/assets/stylesheets/admin/openfoodnetwork.css.scss	2014-10-04 12:51:55 +10:00
Rafael Schouten	884c111240	fix failing tests	2014-10-04 11:56:35 +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	a0494b136f	test that email is validated	2014-10-03 17:32:04 +10:00
Rafael Schouten	c088c47a49	add email to enterprise params	2014-10-03 17:31:46 +10:00
Rafael Schouten	77e354f9f6	Merge branch 'master' into wys	2014-10-03 16:47:11 +10:00
Rafael Schouten	dee471b1c7	move text angular files	2014-10-03 16:43:56 +10:00
Rafael Schouten	bdd9e19efe	specs - add text angular dep and long descrioption provider	2014-10-03 16:42:37 +10:00
Rafael Schouten	34ceb9c226	style text box	2014-10-03 16:06:15 +10:00
Rafael Schouten	bb24e1ce88	sanitize long_description html before injection	2014-10-03 16:06:04 +10:00
Rafael Schouten	e75a964703	Merge branch 'master' into raf_bugfix	2014-10-03 14:26:08 +10:00
Rafael Schouten	8805079faa	use attubutes instead of save!	2014-10-03 14:03:34 +10:00
Rafael Schouten	7313aecd19	add route checking, not working yet...	2014-10-03 12:19:58 +10:00
Rafael Schouten	929839cb9f	hide configuration on	2014-10-03 11:46:00 +10:00
Rafael Schouten	d707ba1a70	remove nokugiri from gemfile.lock	2014-10-02 19:08:37 +10:00
Rafael Schouten	ff4f8f63af	Merge branch 'master' into raf_bugfix ... Conflicts: app/views/spree/order_mailer/confirm_email.text.haml	2014-10-02 19:06:30 +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
Rob Harrington	5f4b2a752b	Product controller loads correct data for create and update actions	2014-10-02 12:32:26 +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