4955 Commits

Author	SHA1	Message	Date
Rohan Mitchell	6193bb896b	Sanitize input for ofnTaxonAutocomplete and userSelect directives	2016-02-24 11:26:38 +11:00
Rohan Mitchell	4314bfb99c	Fix karma fail due to file load order change	2016-02-24 11:26:38 +11:00
Rohan Mitchell	ae03170984	Sanitize input for ofn-select2	2016-02-24 11:26:38 +11:00
Rohan Mitchell	977ff7b35d	Fix compatibility issues with new version of select2	2016-02-24 11:26:37 +11:00
Rohan Mitchell	1e288e5f14	Further styling for select2 after upgrade	2016-02-24 11:26:37 +11:00
Rohan Mitchell	9747b0cf96	Upgrade select2-rails	2016-02-24 11:26:37 +11:00
Rohan Mitchell	258e84fc0a	Replace with-tip with ofn-with-tip: misc	2016-02-24 11:26:37 +11:00
Rohan Mitchell	17cda86dfa	Replace with-tip with ofn-with-tip: enterprise groups	2016-02-24 11:26:37 +11:00
Rohan Mitchell	bdd6d3ba6b	Replace with-tip with ofn-with-tip: business model configuration	2016-02-24 11:26:37 +11:00
Rohan Mitchell	d699f8321a	Replace with-tip with ofn-with-tip: dashboard	2016-02-24 11:26:37 +11:00
Rohan Mitchell	b4976a5445	Replace with-tip with ofn-with-tip: enterprise forms	2016-02-24 11:26:37 +11:00
Rohan Mitchell	e2722710de	Clean up syntax	2016-02-24 11:26:37 +11:00
Rohan Mitchell	45d4dd6b88	Add ofnWithTip directive to sanitise HTML going into tooltips	2016-02-24 11:26:37 +11:00
Rohan Mitchell	6a2e07064b	Fix stomped spree JS file	2016-02-24 11:26:37 +11:00
Maikel Linke	0cb5dfbbe0	delete old sidebar partials	2016-02-19 16:29:19 +11:00
Maikel Linke	6ba534fb58	Show noticeboard in mobile menu	2016-02-19 15:16:24 +11:00
Maikel Linke	38cac3a3c4	Explicitly referencing main_app.discourse_login_path ... Fixes #830.	2016-02-19 11:23:38 +11:00
Maikel Linke	82182d24e7	Merge remote-tracking branch 'origin/master' into discourse-sso	2016-02-19 11:02:59 +11:00
Lynne Davis	2d620071f0	Fxing conflicts	2016-02-11 16:14:44 +00:00
Paul Mackay	50c657133a	Change "&" to "and" ... There are very few places where ampersands are appropriate. Minor typo in footer.	2016-02-09 10:01:51 +00:00
Maikel Linke	3db79aa6b2	Prevent body from scrolling when a modal is open	2016-02-05 15:18:18 +11:00
Rob Harrington	2ebad800b2	Try again: using :site_meta_description for translation of global site meta description	2016-02-05 14:57:18 +11:00
Rob Harrington	dbe7fbc760	Using :meta_description for translation of global site description	2016-02-05 14:17:42 +11:00
Maikel Linke	ac413937f3	Merge remote-tracking branch 'origin/master' into groups	2016-02-05 11:05:40 +11:00
Rohan Mitchell	48b02db70d	Order cycles are undated unless they have both open and close dates defined	2016-02-05 09:27:25 +11:00
Maikel Linke	eef62d4128	fix hub filter style	2016-02-04 16:34:03 +11:00
Maikel Linke	f5ff5bd5b0	Merge remote-tracking branch 'origin/master' into groups	2016-02-04 16:12:57 +11:00
Maikel Linke	bd19bf5f3c	Refactoring filter selectors ... The FilterSelectorsService is now able to create multiple independent lists of selectors. These lists are explicitly given to the filter-selector directive. For example a group's page has one set for the group's producers and one set for the group's shops.	2016-02-04 16:08:19 +11:00
Maikel	3c8df7c4aa	Auto-merged master into delivery_email_updates on deployment.	2016-01-30 05:04:11 +11:00
Lynne Davis	c0afa6be49	Bug fix	2016-01-29 17:57:10 +00:00
Maikel Linke	d0cb9008a2	Delete unused shopfront haml	2016-01-29 16:09:34 +11:00
Rohan Mitchell	533124fe91	Display receival instructions when editing order cycle	2016-01-29 12:17:20 +11:00
Lynne Davis	02616a8ac7	Updates based on testing on staging	2016-01-27 18:43:01 +00:00
Lynne Davis	a9c37c162e	Update email footer to use instance email and social media contacts	2016-01-26 13:14:29 +00:00
Maikel	93de2e4b02	Auto-merged master into delivery_email_updates on deployment.	2016-01-26 11:01:47 +11:00
Lynne Davis	a0f51af355	Correcting name tag for order conf email	2016-01-25 23:50:53 +00:00
Maikel Linke	1f1b0bd783	styling groups blurb	2016-01-22 16:20:07 +11:00
Maikel Linke	d562f6537e	Cleaner opengraph meta tags	2016-01-20 15:42:01 +11:00
Maikel Linke	8c1a16b371	groups blurb text	2016-01-20 14:00:46 +11:00
Maikel Linke	ea796d4f94	Taxon filter for group hubs	2016-01-20 13:32:08 +11:00
Maikel Linke	d5aea1b00d	Taxon filter for group producers	2016-01-20 13:32:08 +11:00
Maikel Linke	fd9de730c8	group producer style adjustment	2016-01-20 13:32:08 +11:00
Maikel Linke	fbdeb557ca	Loading only visible enterprises for group	2016-01-20 13:32:08 +11:00
Rohan Mitchell	07d691fc97	Only apply cart scrolling to non-mobile devices	2016-01-15 16:54:56 +11:00
Maikel	eeb31f65c3	Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.	2016-01-15 16:15:09 +11:00
Rohan Mitchell	046d0f0d19	Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity	2016-01-15 16:07:25 +11:00
ludivinecp	a611e73bed	Opengraph facebook: images and description for shops and groups and home => ok	2016-01-15 14:03:33 +11:00
Maikel Linke	f68f7ea2b6	Fix display of "Total"	2016-01-15 12:07:43 +11:00
Maikel	ddf6eef370	Auto-merged master into ng-vo-inventory-reset on deployment.	2016-01-15 09:21:54 +11:00
Rob Harrington	9979e31220	Final tidy up after rebasing default_inventory and ng-vo onto origin/master ... Fixes a few VO feature specs and a few interface tweaks	2016-01-15 09:07:51 +11:00