12303 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kristina Lim	fca82375e8	Render home page alert as :page_alert outside main content	2019-07-24 12:44:42 +08:00
Kristina Lim	ca0f746cf1	Fix animation and layout for offcanvas menu ... Uses strategy from this forum comment: http://foundation.zurb.com/forum/posts/547#comment_8840	2019-07-24 12:43:44 +08:00
Kristina Lim	a93cf46f50	Fix syntax of existing animations for offcanvas	2019-07-24 12:37:42 +08:00
Kristina Lim	e58546a412	Move offcanvas menu content to separate partial	2019-07-14 13:52:47 +08:00
Kristina Lim	356e00bfbb	Add space for tab bar in medium and below screens	2019-07-03 04:02:28 +08:00
Kristina Lim	5534109122	Undo setting of margin for home tagline	2019-07-03 04:02:22 +08:00
Janine Luk	ac8790ecb3	sticky header for mobile	2019-07-03 03:57:11 +08:00
Maikel	592a468448	Merge pull request #3960 from mkllnk/test-spec-stability ... Remove retries from previously flaky specs	2019-07-02 13:50:16 +10:00
Maikel	8b42bd205a	Merge pull request #3977 from openfoodfoundation/transifex ... Transifex	2019-06-27 09:29:09 +10:00
Transifex-Openfoodnetwork	6108a74fec	Updating translations for config/locales/fr.yml	2019-06-27 00:47:45 +10:00
Luis Ramos	5ecab7a0c2	Merge pull request #3971 from Matt-Yorkley/basket_errors ... Avoid `undefined method 'order'` errors when removing lineitems from basket	2019-06-26 15:33:26 +01:00
Luis Ramos	d8785bdaba	Merge pull request #3932 from luisramos0/shpfront_message ... Improve message in private shopfront when user is not logged in or not a customer	2019-06-26 15:31:06 +01:00
Luis Ramos	00841cb537	Merge pull request #3923 from luisramos0/prod_image_error ... User friendly error when creating a product with an image in an unsupported format	2019-06-26 15:30:18 +01:00
Maikel	eebc49f27c	Merge pull request #3887 from pacodelaluna/add-docker-configuration-for-dev-setup ... Add docker configuration for quick local setup	2019-06-26 21:23:34 +10:00
François Turbelin	b6120a9105	Fix docker-compose application yml file	2019-06-26 11:03:20 +02:00
Luis Ramos	118ed79070	Merge pull request #3904 from luisramos0/subs_stock ... Fix ofn-on-hand directive and fix usage of variant.on_hand in subscriptions order factory	2019-06-25 20:25:06 +01:00
François Turbelin	623d1e0285	Add missing file	2019-06-25 20:05:55 +02:00
François Turbelin	2dcced8810	Put back application example file as it was	2019-06-25 17:59:37 +02:00
Matt-Yorkley	5100ad6b51	Improve #line_items_for logic and add more tests	2019-06-25 15:33:42 +01:00
luisramos0	7e2bead54d	Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity	2019-06-25 14:50:03 +01:00
luisramos0	2b6e6c62dd	Simplify order_factory_spec by extracting copy pasted code to method	2019-06-25 14:50:03 +01:00
luisramos0	05a15d9441	Extract method to remove some copy pasted code in order_factory_spec	2019-06-25 14:50:03 +01:00
luisramos0	567196fe0e	Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock ... The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items	2019-06-25 14:50:03 +01:00
luisramos0	7bd32d4967	Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account ... This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb), since then variant.on_hand does not return infinity if variant is on_demand	2019-06-25 14:47:47 +01:00
Luis Ramos	9b6f1a5e11	Merge pull request #3958 from Matt-Yorkley/pi_encoding ... Improve handling of invalid characters in uploaded CSV files	2019-06-25 14:44:32 +01:00
François Turbelin	84389d1392	Fix setup script with new application YAML file	2019-06-25 14:38:38 +02:00
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
Matt-Yorkley	f19a6f0dec	Add tests for class_eval on Spree::Calculator private method #line_items_for	2019-06-25 12:19:16 +01:00
Matt-Yorkley	0a155da273	Avoid undefined method 'order' errors when removing lineitems from basket	2019-06-25 11:13:56 +01: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