15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rafael Schouten	5dd9879b96	validate description max lenth	2014-10-12 21:57:01 +11:00
Rafael Schouten	01c179856a	set maxlength for short description field	2014-10-12 21:19:59 +11:00
Rafael Schouten	9a6958573a	Merge branch 'master' into bugfix ... Conflicts: app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee	2014-10-12 21:19:02 +11:00
summerscope	a4e72f6fbc	Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top	2014-10-10 18:20:38 +11:00
summerscope	89a51bf1da	Adjustments to layout, responsive logic, simplify column structure	2014-10-10 18:19:42 +11:00
summerscope	d4318263f6	Registration modals styling WIP	2014-10-10 18:18:33 +11:00
Rafael Schouten	3ad7165fd6	add checkout subbmission directive	2014-10-10 17:53:28 +11:00
Rob Harrington	b8b19368df	WIP: Making enterprise emails confirmable	2014-10-10 16:54:38 +11:00
Rohan Mitchell	d5ea2a0206	Make Enterprise and EnterpriseGroup promo images jpg format	2014-10-10 15:40:05 +11:00
Rafael Schouten	01aa8cb761	Use serialiser instead of rabl for current order injection	2014-10-10 15:30:53 +11:00
Rafael Schouten	b68754d634	put payment description in panel	2014-10-10 15:22:21 +11:00
Rob Harrington	9b275cc5f0	WIP: Shuffling around order of cards in registration	2014-10-09 17:26:31 +11:00
Rob Harrington	d1e3f74c03	Add loading gif to image uploaders	2014-10-09 15:56:54 +11:00
Rob Harrington	fc3a132c12	Closing auth dialog on pages other than home returns the user to home	2014-10-09 13:46:32 +11:00
Rob Harrington	31c4aad9e1	JS for closing alerts works	2014-10-09 13:21:30 +11:00
Rob Harrington	49c8e2f8cb	Remove used styling for inline flash	2014-10-09 13:16:09 +11:00
Rob Harrington	83f9867632	Move registration login into own folder, reinstate ofn-inline-alert	2014-10-09 13:15:19 +11:00
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