7773 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julius Pabrinkis	41e91765ca	Add capybara-screenshot gem for integration tests debugging	2017-05-03 11:25:37 +01:00
Maikel Linke	d91c3d1241	Format reset password instructions like Spree	2017-05-03 11:06:48 +10:00
Maikel Linke	b302deb7a3	Add UserMailer specs adapted from Spree code	2017-05-03 11:06:48 +10:00
François Turbelin	2fae467e9a	Translate ResetPasswordConfirmation mail	2017-05-03 11:06:48 +10:00
Em-AK	c72d17dc83	Run karma task only in test environment ... and fails otherwise, as it needs the defaults defined in test environment v1.8.10-rc1	2017-04-28 11:28:24 +10:00
Em-AK	78ffdec693	Force english locale in test environment	2017-04-28 11:28:24 +10:00
Pierre de Lacroix	49c19a1d6a	update wkhtmltopdf-binary and wicked_pdf	2017-04-27 18:38:47 +10:00
Pierre de Lacroix	e854eb0426	add tests ... for methods Spree::Order#tax_adjustment_totals and Spree::Adjustment#find_closest_tax_rate_from_included_tax	2017-04-27 17:32:36 +10:00
Pierre de Lacroix	4a9c17cb28	better tax aggregation	2017-04-27 17:32:36 +10:00
Matt-Yorkley	0d1547f439	Require OC ready_for in simple OC UI	2017-04-21 09:34:50 +10:00
Matt-Yorkley	fa5ed529cb	Added OC form validation	2017-04-21 09:32:49 +10:00
Matt-Yorkley	accb3076e9	Updated translations	2017-04-21 09:32:49 +10:00
Matt-Yorkley	a4e4e1ec68	Require OC name	2017-04-21 09:32:49 +10:00
Maikel Linke	4809237ecc	Fast fail set_order_cycles if distributor not ready	2017-04-19 14:28:17 +10:00
Maikel Linke	81877fedb6	Remove useless andand called on scope	2017-04-19 14:28:17 +10:00
Matt-Yorkley	1f2c6f2a85	Ensure shops display as closed when not configured for sales ... squashme squashme squash squash squash	2017-04-19 14:28:17 +10:00
Matt-Yorkley	4fe5e60967	Updated controller stub to pass test	2017-04-19 14:28:17 +10:00
Matt-Yorkley	f4eb9cb790	Hubs display as closed when not configured for payment or shipping	2017-04-19 14:28:16 +10:00
Maikel Linke	775f9b3ada	Move text from view to locale (i18n)	2017-04-12 10:06:53 +10:00
Maikel Linke	188b33921c	Remove test entry in locale	2017-04-12 09:56:24 +10:00
Maikel Linke	20c033317f	Remove unnecessary string interpolation from view	2017-04-12 09:49:24 +10:00
Matt-Yorkley	e7a5d063ac	Update simple OC form	2017-04-12 09:41:40 +10:00
Matt-Yorkley	1fda781d7e	Set maxlength on OC displayname field	2017-04-12 09:41:39 +10:00
Matt-Yorkley	45fc801a08	Added tooltips to OC form	2017-04-12 09:41:39 +10:00
Maikel Linke	21337a5b50	Merge tag 'v1.8.9' into transifex	2017-04-06 10:36:14 +10:00
Maikel Linke	ec36a843cf	Merge tag 'v1.8.8' into transifex v1.8.8-translated	2017-04-06 10:31:26 +10:00
Transifex-Openfoodnetwork	e99dbaf4d8	Updating translations for config/locales/es.yml [skip ci]	2017-04-05 19:40:18 +10:00
Rob Harrington	c83ad2ecc4	Fixing broken limited reached page in registration flow v1.8.9	2017-04-05 17:02:40 +10:00
Matt-Yorkley	80d8d18eb2	Update terms of service config	2017-04-05 15:48:50 +10:00
Rob Harrington	903d1afb53	Stripping html tags from products description on new form as well	2017-04-05 14:29:23 +10:00
Matt-Yorkley	cd55d2e2ff	Product Description - strip weird tags on paste ... squashme	2017-04-05 11:29:35 +10:00
Rob Harrington	05cf8c4351	Sanitizing product description for textAngular input	2017-04-05 11:29:35 +10:00
Matt-Yorkley	b04d815408	Changes for code review ... Fixed spec	2017-04-05 11:29:35 +10:00
Matt-Yorkley	7b370a2eb6	Removed underline option	2017-04-05 11:29:35 +10:00
Matt-Yorkley	5808b601b8	Added specs for HTML product description	2017-04-05 11:29:35 +10:00
Matt-Yorkley	fdcd3dc3e3	Fixed Capybara not interacting with textAngular	2017-04-05 11:29:35 +10:00
Matt-Yorkley	c4bd085393	Added Angular and textAngular to edit product page	2017-04-05 11:29:35 +10:00
Matt-Yorkley	0e91d01412	UX improvement for selected formatting options	2017-04-05 11:29:35 +10:00
Matt-Yorkley	fcb9e9fa56	Changed buttons	2017-04-05 11:29:35 +10:00
Matt-Yorkley	3591354cb1	Minor tweaks	2017-04-05 11:29:35 +10:00
Matt-Yorkley	b38eab11eb	Fixed frontend HTML display	2017-04-05 11:29:35 +10:00
Matt-Yorkley	c43dea60b7	Product Descriptions formatting	2017-04-05 11:29:35 +10:00
Pierre de Lacroix	268bea25d0	add qz/ folder from ofn-qz gem to list of assets	2017-03-30 20:37:20 +02:00
Pierre de Lacroix	e94ae20b31	fix print_ticket authorization	2017-03-30 20:37:20 +02:00
Maikel Linke	a94961c0a7	Fixup merge conflicts and remove unused text	2017-03-29 14:58:19 +11:00
Lynne Davis	0d5fde919b	Property name spans signle col heading	2017-03-29 14:47:17 +11:00
Matt-Yorkley	429ef4e2ba	Altered product property headings for issue #522	2017-03-29 14:44:30 +11:00
Lynne Davis	e8999d23e1	Updated translations	2017-03-29 13:12:29 +11:00
Keir Osborn	209c9242d9	remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml	2017-03-24 12:55:30 +11:00
Transifex-Openfoodnetwork	6defb09d2e	Updating translations for config/locales/fr.yml [skip ci]	2017-03-21 09:03:15 +11:00