4351 Commits

Author	SHA1	Message	Date
Nicolas Blanc	fb557dd682	Merge branch 'hackweek/i18n' of https://github.com/elf-pavlik/openfoodnetwork into elf-pavlik-hackweek/i18n	2016-01-31 09:16:33 +00:00
Steve Pettitt	4438cbd5d0	Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances	2016-01-30 19:53:53 +00:00
Steve Pettitt	ec6b0f873e	style credit/debit, spec updates	2016-01-30 19:53:37 +00:00
Steve Pettitt	92d830b884	Table styling	2016-01-30 17:56:04 +00: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
Steve Pettitt	5b73b80e81	sorting orders in reverse date order	2016-01-28 23:10:27 +00:00
Steve Pettitt	ccd66bba9c	Credit/debit formatting, use filters for money formatting, use full page width for table	2016-01-28 22:42:45 +00: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	3dd3cfa7ec	Auto-merged master into uk/account-balances on deployment.	2016-01-25 04:43:25 +11:00
Steve Pettitt	295ee47c3a	Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances	2016-01-24 17:34:43 +00:00
Steve Pettitt	c9a8d7efa5	Message for users with no orders	2016-01-22 19:49:03 +00: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
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
Rob Harrington	0bbae19b41	Variant Overrides Index: User can manually reset inheritance	2016-01-15 09:07:51 +11:00
Rob Harrington	607a66b6c6	WIP: Fixing a few broken VO specs	2016-01-15 09:07:50 +11:00
Steve Pettitt	e423e890e0	Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly	2016-01-15 09:07:50 +11:00
Steve Pettitt	25454d3e97	Added new fields to fix VO deletion feature specs	2016-01-15 09:07:49 +11:00
Steve Pettitt	0ee078e232	Added toggle to enable/disable reset stock. Updated specs	2016-01-15 09:07:48 +11:00
Steve Pettitt	34c603a9c3	Added angular service tests for variant overrides stock reset	2016-01-15 09:07:48 +11:00
Rob Harrington	53d97dab08	WIP: Adding view and routes for resetting variant_overrides count_on_hand	2016-01-15 09:07:48 +11:00
Continuous Integration	e070168c4a	Auto-merge from CI [skip ci]	2016-01-15 03:30:02 +11:00
Rob Harrington	cc4dc068ab	Adding variant SKU field to BPE	2016-01-13 18:49:34 +11:00
Rob Harrington	64cd52e067	Adding SKU and on demand to a few VO specs	2016-01-13 18:49:34 +11:00
Rob Harrington	521f227f74	Adding sku and on_demand to VariantOverride	2016-01-13 18:49:33 +11:00
Rob Harrington	cab6871de3	Pulling bulk actions dropdown out into partial	2016-01-13 18:49:33 +11:00
Rob Harrington	7cd8f35ac8	Tidying up styling and use of skeleton columns on index pages	2016-01-13 18:49:33 +11:00
Rob Harrington	2b70ddb23c	Adding columns toggle to variant overrides index	2016-01-13 18:49:33 +11:00
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	54e7677888	Integrating StatusMessages into save-bar, adding to variant overrides index	2016-01-13 18:49:32 +11:00
Rob Harrington	c781113a65	Adding filters to variant overrides interface	2016-01-13 18:49:32 +11:00
Rob Harrington	4237a83028	Moving components required for variant overrides into appropriate modules	2016-01-13 18:49:32 +11:00
Steve Pettitt	f5db1cd921	Images, first attempt at column formatting	2016-01-10 15:53:14 +00:00
Steve Pettitt	262a8e75f9	slugs	2016-01-10 07:58:04 +00:00
stveep	81b688f0e8	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances	2016-01-07 13:26:13 +00:00
stveep	698d36180d	Move query from injector to User instance method	2016-01-07 13:25:15 +00:00
Maikel Linke	217fa9a57c	UI integration of Discourse login	2016-01-07 19:01:09 +11:00
Christian	839bf8794f	Fix a hard cocded string on Order summary screen ... Created an order_pickup_time entry in locale files.	2016-01-07 07:06:26 +01:00
Christian	823a6bff5b	Use config to get logo in mails ... Use ContentConfig.footer_logo to get localized logo file instead of defaut AUS logo.	2015-12-24 11:31:47 +11:00
stveep	f9435a3c34	Starting i18n	2015-12-23 14:39:56 +00:00
stveep	59adf88cad	Feature spec	2015-12-22 22:59:07 +00:00