12271 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
François Turbelin	da3b467d47	Use https to fetch Postgres repo	2019-06-25 14:09:59 +02:00
François Turbelin	ceffae2efc	Delete extra example file	2019-06-25 14:08:18 +02:00
François Turbelin	c0d02c8d42	Fix errors while relauching container	2019-06-25 12:05:26 +02:00
François Turbelin	e68d72c0dd	Update DOCKER.md	2019-06-25 11:47:54 +02:00
François Turbelin	5dcf456c90	Remove old Rake task for sample data	2019-06-25 11:18:48 +02:00
François Turbelin	79ec3d5a3f	Remove extra copy on Docker file	2019-06-25 11:18:48 +02:00
François Turbelin	e893197c49	Use example files instead of extra Docker ones	2019-06-25 11:18:48 +02:00
Matt-Yorkley	60e67ae1a4	Run all setup steps on startup ... It's a bit dirty, but it works :)	2019-06-25 11:18:48 +02:00
Matt-Yorkley	53a0f70aa0	Add default login details via ENV vars	2019-06-25 11:18:48 +02:00
Matt-Yorkley	64d6ae445b	Change postgres repo from precise to bionic	2019-06-25 11:18:48 +02:00
Matt-Yorkley	5712f67673	Remove phantomjs from dependencies	2019-06-25 11:18:48 +02:00
François Turbelin	9c45444ea6	Clean database.docker.yml file	2019-06-25 11:18:48 +02:00
François Turbelin	4e41a73c4f	Enhance Dockerfile	2019-06-25 11:18:48 +02:00
François Turbelin	75267268d7	Update Postgres to 9.5	2019-06-25 11:18:48 +02:00
François Turbelin	7455053879	Update DOCKER.md file	2019-06-25 11:18:48 +02:00
François Turbelin	c5addb8c1d	Fix comment spacings, gloupsss	2019-06-25 11:18:48 +02:00
François Turbelin	e5d4b216ba	Add DOCKER.md file as documentation	2019-06-25 11:18:48 +02:00
François Turbelin	b4fe44510b	Tune up the Rake task	2019-06-25 11:18:48 +02:00
François Turbelin	9df5d78f27	Add a Rake task in order to setup dev env	2019-06-25 11:18:48 +02:00
François Turbelin	f9d72e10d5	Add Docker configuration	2019-06-25 11:18:48 +02:00
Maikel	723499332a	Merge pull request #3006 from mkllnk/i18n-error-detection ... Raise error on missing translation keys	2019-06-25 16:13:15 +10:00
Maikel Linke	6a06e0ac3b	Raise error on missing translation keys	2019-06-25 15:06:56 +10:00
Luis Ramos	5600102729	Merge pull request #3876 from luisramos0/3804_insuf_stock ... 3804 Fix editing cart when variant on_demand but its on_hand value is zero or negative	2019-06-24 22:24:15 +01:00
luisramos0	a6ea975848	Fix editing cart when variant on_demand but on_hand is zero or negative	2019-06-24 22:07:46 +01:00
Luis Ramos	57917a498b	Merge pull request #3946 from luisramos0/missing_translatiojns ... Fix last missing translations covered by specs	2019-06-24 20:52:59 +01:00
Luis Ramos	b30da27e92	Merge pull request #3950 from openfoodfoundation/dependabot/bundler/stripe-4.19.0 ... Bump stripe from 4.18.1 to 4.19.0	2019-06-24 20:44:57 +01:00
Maikel	e4c3c1664a	Merge pull request #3943 from jonleighton/issue-2112 ... Bring back ‘Shop for X products at:’ title	2019-06-21 15:06:21 +10:00
Maikel	5b0c8bbaef	Merge pull request #3836 from Matt-Yorkley/fast_and_furious2 ... Improve /shops, /producers, and /groups performance	2019-06-21 15:02:19 +10:00
Maikel	71f396a44f	Merge pull request #3896 from luisramos0/clear_unit_desc ... Clear product.variants.unit_description if product.variant_unit is items	2019-06-21 15:00:06 +10:00
Maikel	eb162f6b29	Merge pull request #3934 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.2 ... Bump activerecord-import from 1.0.1 to 1.0.2	2019-06-21 14:59:03 +10:00
Maikel	5aea361d87	Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4 ... Start upgrade to Rails 4	2019-06-21 14:58:24 +10:00
Maikel	3721c017fa	Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets ... [Spree Upgrade] Remove dependency to spree frontend - routes and controllers	2019-06-21 14:57:03 +10:00
Maikel	12f0ed9955	Merge pull request #3940 from luisramos0/zones ... Remove matching of shipping method zone to user address on checkout	2019-06-21 14:43:40 +10:00
Maikel	4c4881430c	Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import ... 3877,3843 Improve handling of units and unit type in product import	2019-06-21 14:43:01 +10:00
Matt-Yorkley	ab1ed53507	Merge pull request #3955 from openfoodfoundation/remove-travis-leftover ... No need to keep old and used Travis config file	2019-06-18 16:48:13 +01:00
luisramos0	2b3865855d	Simplify shipping_method.include? method	2019-06-18 11:42:34 +01:00
luisramos0	1da18d3386	Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope	2019-06-18 10:52:56 +01:00
luisramos0	b025df1798	Fix a few more rubocop issues	2019-06-18 10:52:56 +01:00
luisramos0	178924af5d	Fix long lines in order_cycle model	2019-06-18 10:52:45 +01:00
luisramos0	bb1f7fde2f	Remove unused routes related to taxons ... t/products was already an old route 4 years ago and t/*id is not currently working in master	2019-06-18 10:49:20 +01:00
luisramos0	c61e7a1672	Remove unused routes ... This fix is in spree 2.1 here: ba420fe70e	2019-06-18 10:49:20 +01:00
luisramos0	3c964933b1	Remove stub of a deleted method #deadcode	2019-06-18 10:49:20 +01:00
luisramos0	e7b625edcf	Remove spree locale route ... This route is not used, ofn code uses query param locale that is picked up in base controller set_locale	2019-06-18 10:49:20 +01:00
luisramos0	eab6cc563b	Fix rubocop issues	2019-06-18 10:49:20 +01:00
luisramos0	8daf9b9247	Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form	2019-06-18 10:49:20 +01:00
luisramos0	5ba0f906a1	For some reason we need the orders populate route to make product import routes work	2019-06-18 10:49:20 +01:00
luisramos0	35c8236c21	Add missing datepicker/cal.gif to ofn assets	2019-06-18 10:49:20 +01:00
luisramos0	b397a8e661	Remove spree_frontend and spree_sample from ofn's gemfile ... spree_frontend will only be removed from gemfile.lock when spree_auth_devise is removed from OFN	2019-06-18 10:49:20 +01:00
luisramos0	61def8f2e7	Convert match routes to get routes to be compatible with rails 4	2019-06-18 10:49:20 +01:00
luisramos0	4ff0bf8162	Change gemfile to depend on the different spree gems, not spree as a whole	2019-06-18 10:49:20 +01:00