1368 Commits

Author	SHA1	Message	Date
luisramos0	6fc3562a73	Merge branch 'master' into 2-0-stable-dec-18th	2018-12-18 23:32:45 +00:00
Maikel	84f2f9af3c	Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new ... [Defacepocalypse] De-deface payment methods new and form	2018-12-19 09:44:57 +11:00
Matt-Yorkley	d34b8c52b8	Update all locales with the latest Transifex translations	2018-12-17 11:17:54 +00:00
Pau Pérez Fabregat	554d650b8c	Merge pull request #3176 from kevinchristianson/button-translation-fix ... Fix untranslated buttons at image step of registration modal	2018-12-17 10:36:07 +01:00
luisramos0	5183c90c89	Add missing spree translations related to insufficient stock	2018-12-12 15:34:48 +00:00
luisramos0	cdee7c0422	Merge branch 'master' into 2-0-stable-dec-10th	2018-12-10 16:41:29 +00:00
haseleyi	75277e92e4	Lazy-load the translations for images step of registration	2018-12-05 11:36:27 -08:00
Transifex-Openfoodnetwork	18a5f53330	Updating translations for config/locales/fr.yml	2018-12-05 09:17:00 +11:00
Transifex-Openfoodnetwork	9bedc69df8	Updating translations for config/locales/en_GB.yml	2018-12-05 04:52:44 +11:00
Maikel Linke	66585e93a8	Update all locales with the latest Transifex translations	2018-12-04 14:48:03 +11:00
luisramos0	3776b891ce	Merge branch 'master' into 2-0-stable-dec-3rd	2018-12-03 15:30:16 +00:00
Hugo Daniel	24dab58de7	Lazy load translations and add keys	2018-11-30 10:49:36 +01:00
Pau Pérez Fabregat	9f17acd63c	Merge pull request #3136 from kevinchristianson/dashboard-translation ... Add missing translation for 'Has Shopfront' in single-enterprise dashboard	2018-11-29 16:27:05 +01:00
Pau Perez	957c38e4f2	Add missing translations causing a test failure	2018-11-28 18:38:09 +01:00
Pau Pérez Fabregat	3ea7fac25f	Merge pull request #3095 from luisramos0/admin-users-transl ... In admin/users, convert Spree.t calls to t calls and use lazy lookup	2018-11-28 17:37:42 +01:00
Pau Pérez Fabregat	8df781887a	Merge pull request #3111 from kevinchristianson/pay-list-translation ... Add translation for 'Back to Payments List' button in new payment form	2018-11-28 17:03:29 +01:00
Pau Pérez Fabregat	438cff6e6d	Merge pull request #3080 from Matt-Yorkley/pi/french_issue ... Pi/french issue	2018-11-28 13:39:04 +01:00
Pau Pérez Fabregat	869f17256d	Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee ... Add an API endpoint for EnterpriseFeesController#destroy	2018-11-27 17:28:43 +01:00
luisramos0	e153510a71	Merge branch 'master' into 2-0-stable-nov-24th	2018-11-24 15:19:38 +00:00
haseleyi	691de9199f	Add missing translation for 'Has Shopfront' in single-enterprise dashboard	2018-11-23 11:23:28 -08:00
luisramos0	7257ab30f1	Fix typo in inventory_error_flash_for_insufficient_quantity translation	2018-11-23 08:39:46 +00:00
Hugo Daniel	d7a148bb75	Fix checkout feature specs	2018-11-22 17:01:39 +01:00
haseleyi	d4b49a662f	Add translation for 'Back to Payments List' button in new payment form	2018-11-21 15:33:45 -08:00
luisramos0	2abf4e39cb	Add missing translation to admin new order creation page	2018-11-21 23:22:43 +00:00
Matt-Yorkley	b3a9b502fa	Add missing translation key	2018-11-21 19:16:08 +00:00
luisramos0	783e0eed3c	In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml	2018-11-21 11:46:14 +00:00
luisramos0	0189cefd1c	Update all locales with the latest Transifex translations	2018-11-20 22:40:11 +00:00
Pau Pérez Fabregat	4c6dec6203	Merge pull request #3082 from coopdevs/remove-travis-leftovers ... Remove all database.travis.yml	2018-11-20 09:35:12 +01:00
Luis Ramos	a7bd793ad2	Merge pull request #3074 from luisramos0/2-0-acct-transl ... [Spree Upgrade] Fix missing translation in User transaction history	2018-11-20 00:43:24 +00:00
Pau Perez	9301c5e1d5	Remove all database.travis.yml ... We no longer use this file since we started with Semaphore CI.	2018-11-19 17:16:04 +01:00
luisramos0	d282823d3a	Fix missing translation in user transaction history	2018-11-18 16:15:35 +00:00
luisramos0	1fc11c5658	Add missing translation in the checkout confirmation page	2018-11-16 22:56:41 +00:00
Pau Perez	c7a1c4b253	Change order date column translation in BOM ... This makes it consistent with the order page. In both cases we use the `completed_at` column underneath.	2018-11-15 19:09:17 +01:00
Hugo Daniel	7b33712f7a	Add an API endpoint for EnterpriseFeesController#destroy	2018-11-15 14:05:08 +01:00
luisramos0	0a77eeb4b6	Merge branch 'master' into 2-0-stable-nov-14th	2018-11-14 11:35:58 +00:00
Pau Pérez Fabregat	605f84d30a	Merge pull request #3010 from openfoodfoundation/transifex ... Transifex	2018-11-14 11:27:01 +01:00
Pau Pérez Fabregat	8ee193dbcf	Merge pull request #2984 from Matt-Yorkley/email_https_links2 ... Specify only email link protocol setting	2018-11-14 11:26:14 +01:00
Transifex-Openfoodnetwork	f9fae06a7a	Updating translations for config/locales/en_BE.yml	2018-11-10 07:09:02 +11:00
Maikel	57efc36448	Merge pull request #2993 from Matt-Yorkley/user_class ... Deal with failing Spree::LegacyUser test	2018-11-09 10:21:31 +11:00
Luis Ramos	ed7c12bd26	Merge pull request #2997 from luisramos0/2-0-stable-nov-8th ... [Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)	2018-11-08 19:20:42 +00:00
Luis Ramos	4149c95c65	Merge pull request #2991 from Matt-Yorkley/missing_resource_translation ... [Spree Upgrade] Import missing translations from Spree 2 to fix some tests	2018-11-08 12:34:53 +00:00
luisramos0	fcdb5cd7af	Merge branch 'master' into 2-0-stable-nov-8th	2018-11-08 11:18:54 +00:00
Matt-Yorkley	edbfd64a44	Set the Spree.user_class explicitly in spree initializer	2018-11-08 00:04:04 +00:00
Matt-Yorkley	cfc31f1fbd	Import missing translations from Spree 2 to fix some tests	2018-11-07 19:23:28 +00:00
Pau Pérez Fabregat	72a9d39ee1	Merge pull request #2932 from luisramos0/2931-weight-calculator ... 2931 Refactor and prepare weight calculator for spree 2	2018-11-07 18:40:38 +00:00
Pau Pérez Fabregat	ecc69c2c58	Merge pull request #2948 from pfac/pfac-config-time-zone ... Fix default time zone config	2018-11-07 18:39:25 +00:00
Matt-Yorkley	5b16353938	Specify only link protocol setting	2018-11-07 11:22:24 +00:00
luisramos0	9490da329a	Move Calculator::Weight from models/open_food_network/calculator to models/calculator	2018-11-07 09:54:30 +00:00
Pau Pérez Fabregat	a4139a14a8	Merge pull request #2977 from luisramos0/2-0-payment-translation ... [Spree Upgrade] Add missing failed authorization translation	2018-11-06 16:01:00 +00:00
luisramos0	c191a1feb8	Add missing translation related to authorization failure	2018-11-06 10:20:52 +00:00