7749 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Transifex-Openfoodnetwork	2774c09d7a	Updating translations for config/locales/nb.yml [skip ci]	2017-03-20 07:10:53 +11:00
Matt-Yorkley	c62a044598	PI highlight invalid fields in feedback tables v1.8.8	2017-03-17 16:11:52 +11:00
Matt-Yorkley	f73fbe7f23	SpreadsheetEntry Class and PI refactor	2017-03-17 16:11:52 +11:00
Matt-Yorkley	5e1e4c1d19	Product Import UX review updates ... Minor tweaks Minor fix	2017-03-17 16:11:52 +11:00
Matt-Yorkley	cc5a335fb7	Refactor and additional permissions checks ... Don't include non-permitted enterprises in existin product count Tweaked feedback	2017-03-17 16:11:52 +11:00
Matt-Yorkley	91fc3f33a0	PI reset and save step improvements	2017-03-17 16:11:52 +11:00
Matt-Yorkley	648753b412	Improved save step UI	2017-03-17 16:11:52 +11:00
Matt-Yorkley	24fcc3dd34	PI reset absent products	2017-03-17 16:11:52 +11:00
Matt-Yorkley	14fb40a996	Product Import options and defaults ... Added available_on test Obscure case fix and extra spec	2017-03-17 16:11:52 +11:00
Matt-Yorkley	f4511fc74d	PI permission test	2017-03-17 16:11:52 +11:00
Matt-Yorkley	3d0f192490	Product Import update	2017-03-17 16:11:52 +11:00
Matt-Yorkley	6b7cdf3a37	Product Import Refactoring	2017-03-17 16:11:52 +11:00
Matt-Yorkley	052d6c6b02	Product Import basic specs	2017-03-17 16:11:52 +11:00
Matt-Yorkley	6e5c878491	Product Import cancan permissions and ui tab	2017-03-17 16:11:52 +11:00
Matt-Yorkley	c0c6cd1a60	Product Import feature	2017-03-17 16:11:52 +11:00
Matt-Yorkley	2ad433590d	Add roo gem	2017-03-17 16:11:52 +11:00
Rohan Mitchell	2cb3da56ab	Fix regression: Transaction fee double-charged	2017-03-17 12:02:13 +11:00
Rohan Mitchell	8582e6d6b4	Add robustness check against intermittent spec failure	2017-03-17 12:02:13 +11:00
Rohan Mitchell	170101cbfe	Avoid reloading order during checkout request, which clears credit card number	2017-03-17 12:02:13 +11:00
Maikel Linke	8107f49373	Merge remote-tracking branch 'origin/master' into transifex ... Conflicts: config/locales/fr.yml	2017-03-16 09:30:22 +11:00
Rob Harrington	7ef0964af2	Adding shortcuts for both sales tax reports to the reports index v1.8.8-rc1	2017-03-15 23:57:13 +11:00
Rob Harrington	18472ea8c3	Making 'tax types' report the default sales tax report	2017-03-15 23:56:44 +11:00
Rob Harrington	36e0f45a89	Show the shops invoice text on old invoice template	2017-03-15 17:39:21 +11:00
Rob Harrington	bea0b2b1e5	Adding feature toggle for receipt printing using qz	2017-03-15 16:39:04 +11:00